Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'
* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
Make a stupid thing about the glue less stupid.
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp
* commit 'faccac7616795859af257777900db514d425a106':
Make a stupid thing about the glue less stupid.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'
* commit 'b14f325a0118ffce286155caaabaae149653462c':
Add ANativeWindow API for directly drawing to the surface bits.
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp
* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:
- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.
Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'
* commit '0260887ca78330b8dd7009d91859925df94a69d6':
Improved logging when there's an error creating the directories in getFilesDir()
Merge commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270'
* commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270':
Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
Merge commit 'd321e8d6882485203b159b224d49247707bdd5aa'
* commit 'd321e8d6882485203b159b224d49247707bdd5aa':
Remove some (unused, non-public) phone-related status bar notification icons
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp
* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
Remove some (unused, non-public) phone-related status bar notification icons
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp
* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
Fix swap of sessionId and output in audio effect API.
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'
* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
Enable the support for decoding audio with AAC+ and eAAC+ features
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp
* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
Enable the support for decoding audio with AAC+ and eAAC+ features
Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'
* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
Add runtime dumpsys support for media recorder client
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp
* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
Add runtime dumpsys support for media recorder client
Merge commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621'
* commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621':
Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Merge commit '4dc96b8513ad3d3af54321716251f789769a11b4'
* commit '4dc96b8513ad3d3af54321716251f789769a11b4':
Use fullScreenIntent to show the USB mass storage dialog.
Merge commit 'f3bfd841019b404f98a67fc307240031790344c9'
* commit 'f3bfd841019b404f98a67fc307240031790344c9':
Remove voice mail number verification for testing on no-sim device
