Merge commit '9e0e054388689fd618c84a283c28ee484477b44d'
* commit '9e0e054388689fd618c84a283c28ee484477b44d':
Fix a native crash in input dispatcher when windows are removed.
Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'
* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
Add support for secure system overlays. (DO NOT MERGE)
Merge commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4'
* commit 'bce520e6460e712c0985f12cf212e2d72fd1b9e4':
DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp
* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
Add the HTML5Audio class, to support the audio tag.
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'
* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Merge commit '13e46665ff69c1a37880762d7d611aacdf02dac7'
* commit '13e46665ff69c1a37880762d7d611aacdf02dac7':
Work on issue #3101415: Crespo apps seem to have their UID changed over time.
Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'
* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
Merge commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef'
* commit '10d48f26e72dc7978ae683e8f99cc71409eb75ef':
Debug logs for issue #3101415: Apps seem to have their UID changed over time.
Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349'
* commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349':
NFC: Move NFC service implementation out of system_server.
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'
* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
Make sure we cache the sampleTable again if using the caching datasource.
Merge commit '6e48b5f97af6d67574fee6053174c184f87ce583'
* commit '6e48b5f97af6d67574fee6053174c184f87ce583':
Updated GPS icons and new status bar background
Merge commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9'
* commit 'c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9':
DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Merge commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df'
* commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df':
Another attempt at popup assets (hdpi and mdpi)
Merge commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a'
* commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a':
[3095807] screen takes a long time to turn on
Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'
* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
Test that we don't leak sensitive information when logging cookies.
Merge commit 'a8faf91fa558be1235d508e776eb24be4429585c'
* commit 'a8faf91fa558be1235d508e776eb24be4429585c':
fix [3095607] Gingerbread screen turn-on animation does not show the last frame
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp
* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
Set default heap size to 5MB.
Merge commit '5e7b7cd65bea53357ecad68a31a52883897c824b' into gingerbread-plus-aosp
* commit '5e7b7cd65bea53357ecad68a31a52883897c824b':
range checking for tnf
Merge commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8' into gingerbread-plus-aosp
* commit 'dc83fd5a502b255dd29a4ab351fc902105ca6bb8':
Import revised translations DO NOT MERGE
Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp
* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
Fix a native crash in input dispatcher when windows are removed.
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp
* commit 'c1a564b108c511c0bdd699567c245b031930e718':
Add support for secure system overlays. (DO NOT MERGE)
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp
* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
