Merge commit '3540760d1d68cc883122d44ab1d38f542fb646e6'
* commit '3540760d1d68cc883122d44ab1d38f542fb646e6':
Don't drop a late frame which may lead to missing I frames in the MP4 file
Merge commit '177a7ad825445acaeea38c48c74ad87db935d054'
* commit '177a7ad825445acaeea38c48c74ad87db935d054':
Return error from MPEG4Writer stop() if the check on codec specific data failed
On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.
Change-Id: Id0bfe54293bd51211f84976be2d72f8b1ad0100d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Resolving name conflict in model viewer.
Adding fov projection matrix function.
Adding helper methods for blending.
Change-Id: Ibd3f1510436811398787c285845d050158bd6de8
Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1'
* commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1':
Fix for a Resource system bug that displayed the wrong name for missing asset.
Merge commit 'd88e0680edd88e10870d5f6f303633cea839d686'
* commit 'd88e0680edd88e10870d5f6f303633cea839d686':
DO NOT MERGE. Load assets in place instead of deferring until draw.
Merge commit '36c051c717391afe12a1fe8163960286175f2f7e'
* commit '36c051c717391afe12a1fe8163960286175f2f7e':
make android_id random seed depend on time as well as ro.serialno
Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'
* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
Make MediaWriter stop and pause return errors if necessary
Merge commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce'
* commit 'd7d58be0b8c1be69bfb774f38bf6d1410d87c4ce':
Make the throttling more sensitive to end-to-end latency.
Merge commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a'
* commit 'b3aaf3baa7fd811af19835bbc8837a88984c160a':
fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
Merge commit '873ebfb825cb498d9ff3012d1d31b02e31a79980'
* commit '873ebfb825cb498d9ff3012d1d31b02e31a79980':
Support for MP4V-ES packetization format according to RFC3016.
Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'
* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'
* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Merge commit '1f4421048206ca1745ddd6366588759c9c5c38f9'
* commit '1f4421048206ca1745ddd6366588759c9c5c38f9':
Improve orientation sensing when waking up while flat.
Merge commit 'eb21c38a5340c0e73cb8104217aa5bb01229d22c'
* commit 'eb21c38a5340c0e73cb8104217aa5bb01229d22c':
RTP: fix few leaks when fail to add streams into a group.
Merge commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2'
* commit '9f7257f0a14cd17d8b55bc3bd1584dac2f9dd1b2':
Fix a bug, where one thread is using JNIEnv associated with another thread.
Merge commit '43647129d676e8c802850ca493f2ebc6064a4a1a'
* commit '43647129d676e8c802850ca493f2ebc6064a4a1a':
fix [2931161] crash in labyritnth when completing a level
Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9'
* commit '4600139173c80db4ebfb70e2417231e9678d37f9':
DO NOT MERGE Do not kill sockets going default->hipri
- DialogFragment now has an option to not show a dialog, so you can
use your UI somewhere else.
- Deprecated show() versions that were tied to activities.
- Added documentation to DialogFragment class.
- Added documentation to onSaveInstanceState() to explain how the
time it is called is different than Activity's version.
- Fixed some java doc warnings.
Change-Id: If026744c368e2443030d2d9e0a9c808d820857df
