Merge commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de'
* commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de':
Clean ExifInterface. Prepare to make it public.
Merge commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac'
* commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac':
Add the hide for the inner class definition.
Merge commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2'
* commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2':
Fix the missing part for reading enterprise fields in wifi configuration
Merge commit '46f116520fe7ec04e99dd37d805fc852a71bf795'
* commit '46f116520fe7ec04e99dd37d805fc852a71bf795':
Flag indicating if Contacts source has any unsynced groups.
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'
* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
Implement issue #1780928: Need support hiding nav keys.
Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'
* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
Make vCard importer code use Account information if possible.
Merge commit 'a432231515df66fa4051bae1d8d319f315af8cca'
* commit 'a432231515df66fa4051bae1d8d319f315af8cca':
revert to black video background, since we don't need the color-key anylonger
Merge commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db'
* commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'
* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
Merge commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8'
* commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8':
New field in CallerInfo to cache if the call is an emergency one.
Merge commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164'
* commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164':
Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
Merge commit 'd071bbd7fbc64775040950d1e21174f93c8b831e'
* commit 'd071bbd7fbc64775040950d1e21174f93c8b831e':
make the window-shade use an opaque surface if possible
Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'
* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca'
* commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca':
Allow only System Service to send most Bluetooth intents.
Merge commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef'
* commit 'c2ee811d09126236ae41b2b3015ed60d508ac9ef':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '21da33570278762d7e9375b83eb74130bf82728d'
* commit '21da33570278762d7e9375b83eb74130bf82728d':
First pass at replacing native plugin views with java.
Merge commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a'
* commit 'dda648f00aa6ea7b12dc4b96e70a6ced3c422e4a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1'
* commit 'c52ae862ef18218f6db0c8b538d5cdf2685a07b1':
Build the BitmapShader if it hasn't been built yet.
Merge commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950'
* commit '39b3bb95a7ab2488a6a07417b045ddfd36b5a950':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758'
* commit 'bfb4992f190b1f93e70d2102f35f8df019406758':
Adding a system property to log slow queries
Merge commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085'
* commit 'ecbcbf32b0e0231225ec8370002c72be7a94d085':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Merge commit '1198aa27f1c1952199dac8b59a14ab76a8fde607'
* commit '1198aa27f1c1952199dac8b59a14ab76a8fde607':
Added an API IOMX::createRendererFromJavaSurface.
Merge commit 'bd92532faaacb31ffbae6ecc159516e7c70ca068'
* commit 'bd92532faaacb31ffbae6ecc159516e7c70ca068':
Add more error message if the script failed to pull result file from device.
Merge commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047'
* commit 'ac02592986ef5c0d6f8a4f01627c0caa69d7b047':
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
Merge commit 'a451c6255962116516c3b4df92fd72084a881e0e'
* commit 'a451c6255962116516c3b4df92fd72084a881e0e':
redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5'
* commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit 'dd4819f377509060bc441be9f04124e967acf0a3'
* commit 'dd4819f377509060bc441be9f04124e967acf0a3':
DockObserver wakes the display when broadcasting a change
Merge commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c'
* commit 'a90d14f2ddef7f09a1cfb98a7d25b1dbc237409c':
Add SurfaceView API to put surface on top of window.
