Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'
* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
Turn the media time adjustment in file writer back on
Merge commit '101f14b275ab2451aef50dec427376d721d17aea'
* commit '101f14b275ab2451aef50dec427376d721d17aea':
Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'
* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
Fix issue #3117918: No way to finish a native activity
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp
* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp
* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
Fix issue #3117918: No way to finish a native activity
o This was turned off to unblock the tests on some device
o The adjustment duration is increased to suppress fluctuations observed on some device
bug - 3058745
Change-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573
Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7'
* commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7':
fix [3119687] [Maps][4.6.0] Force close in street view
Merge commit '46beb43357e32507189203db4626d0df954abe62'
* commit '46beb43357e32507189203db4626d0df954abe62':
Mirror the preview for front-facing cameras. do not merge
Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp
* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
fix [3119687] [Maps][4.6.0] Force close in street view
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
Merge commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp
* commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
Use correct size of GAMEPAD_KEYCODES
If the library couldn't be printed to the string, installd should fail
early instead of trying to chmod() back to uninitialized stat struct.
Bug: 3121721
Change-Id: I8a3604954ae657a1e07c1ad8d5569aa80aff9e0a
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.
Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.
Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
Part of issue #3116702: New manifest tags for supported screen sizes
Kind-of.
If you turn your head side-ways.
Change-Id: I446f1e2eadba1ce284c93ff9fb0197bb0e6b0fca
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'
* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
allow dumpstate to work for non-root users.
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.
Bug: 3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
DragEvent.getResult() returns 'true' if the drop was ultimately accepted;
false otherwise. The validity of this datum is only guaranteed when the
DragEvent's action verb is ACTION_DRAG_ENDED.
Also fixes the drag-start timeout handling (though the offending app is
not yet officially declared ANR).
Implements bug 3097807
Change-Id: I6908ac628c72ff7d6193d87060d769a559a78d0e
