Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp
* commit 'b1104b3713febb75164938a465c3022e1879245f':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp
* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
Use new nativeLibraryPath field for NativeActivity
Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.
Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp
* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
Reduce footprint of Signature from ~7000 to ~1448
Merge commit '7627c221c6ce8bf433bf207b002eabe7236c4757' into gingerbread-plus-aosp
* commit '7627c221c6ce8bf433bf207b002eabe7236c4757':
DO NOT MERGE Tweak overscroll
Signature had lazy initialization of the mString member when needed, but
it would stick around forever when initialized. Each package had one or
more Signatures that would be ~7000 bytes each. At a couple hundred
packages, that's over 1.3MB just for signatures.
Whenever packages.xml was written out, it would write the Signature for
each program as well which happens at boot thereby initializing the
mString member pretty much immediately.
Change-Id: Idb882ffeca2861b3e87437fc83f001710d6c0441
Merge commit '69717ccd13bb5568b912701ab39d603cfa7091cc' into gingerbread-plus-aosp
* commit '69717ccd13bb5568b912701ab39d603cfa7091cc':
DO NOT MERGE. Some stuff that is Not Ready.
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp
* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
Adding a feature denoting support for 5 or more fully
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp
* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
These are not ready to be exposed. Also rename them to be better.
Merge commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2' into gingerbread-plus-aosp
* commit '947e25e5ffe13549dab82580ef05f1f4faf42cd2':
Add BT test instrumentation for reboot tests.
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp
* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
DO NOT MERGE Separate utility methods into utility class.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close(). The constructor
is derived from setUp() and close() from tearDown().
Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
