Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp
* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit '393e1459340effdb8bdc6531e22c0976d0aea026'
* commit '393e1459340effdb8bdc6531e22c0976d0aea026':
put the status bar back in the system process
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'
* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
Add multiple camera support for in MediaProfiles.
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp
* commit '45bac57aa00281e6b45756c691c588bdaf762521':
Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp
* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
put the status bar back in the system process
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp
* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
Add multiple camera support for in MediaProfiles.
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp
* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
Add ability to guard a thread against setting its own prio to bg
Merge commit 'c6e1d88022db800773401c16803e1ab27fd01a7e' into gingerbread-plus-aosp
* commit 'c6e1d88022db800773401c16803e1ab27fd01a7e':
Introduce official public NativeWindow type.
Merge commit '30fe6fa07a9b9c6e7498198608125add8eb40744' into gingerbread-plus-aosp
* commit '30fe6fa07a9b9c6e7498198608125add8eb40744':
fix live wallpapers on Droid
Merge commit '705a2df97c51c3e31ed36831a4302d705e0532b2'
* commit '705a2df97c51c3e31ed36831a4302d705e0532b2':
Remove memory monitoring from the system watchdog
Merge commit '86405cbd53f43529898000112bc9346c21569d26'
* commit '86405cbd53f43529898000112bc9346c21569d26':
Support for vanilla YUV420sp => RGB565 color conversion.
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'
* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
Verify hostname where possible, and clarify where not.
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.
Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'
* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
docs: revise menu guide to focus more on using menu resources
Merge commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08' into gingerbread-plus-aosp
* commit 'c8525edcba58cba7ce17ef72bc64fc3439943c08':
Remove memory monitoring from the system watchdog
Merge commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e' into gingerbread-plus-aosp
* commit '294c9fb8990ded73be52a3c1bfddbe1cebcd8b8e':
Improved graphics for the intruder alert.
Merge commit 'caad0a5c6318678902402362df1791d286636344' into gingerbread-plus-aosp
* commit 'caad0a5c6318678902402362df1791d286636344':
Support for vanilla YUV420sp => RGB565 color conversion.
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp
* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
Verify hostname where possible, and clarify where not.
Merge commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c' into gingerbread-plus-aosp
* commit '92dbad8ab0c8e242c4c3e52c339ed3296ae7901c':
docs: revise menu guide to focus more on using menu resources
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.
Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e