Merge commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa'
* commit '9fc38f40feb871bd51309244984b1d13bdc5b9aa':
Bring up the soft keyboard when touching a focused textfield.
Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'
* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
Remove trackball double click. Treat each click as a single click.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'
* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
Set the minimum fling to the title height.
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'
* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
Add "rtsp" to the list of URL schemes that get linkified.
Merge commit '474443fac4926c46a09cec9f50024bf9ebe72c94'
* commit '474443fac4926c46a09cec9f50024bf9ebe72c94':
Fix the parsing for instrumentation result, some Java exceptions are not reported right now
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'
* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit '5962166750355c36efb9f209fcff33edf837186c'
* commit '5962166750355c36efb9f209fcff33edf837186c':
Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'
* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
Use floor to calculate the range to avoid the rounding error triggered
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'
* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
Tell GlobalSearch about searches without a suggestion
Merge commit '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83'
* commit '6fc35e3e7e6c61f2f7f5176d6979ae860f471e83':
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
Merge commit '2fa86ffcba23137bb296972b98a119723e133000'
* commit '2fa86ffcba23137bb296972b98a119723e133000':
Pass return code from Camera HAL for setParameters().
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit '905d7f57d44b8598994f3d24ca27db6f9748f05a'
* commit '905d7f57d44b8598994f3d24ca27db6f9748f05a':
Don't init wifiChannels until after supplicant up
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'
* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6'
* commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6':
dumpstate: Switch back to running as non-root
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'
* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'
* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'
* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f'
* commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f':
Save and restore partial supplicant data, not the whole file.
Merge commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f'
* commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'
* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8797066aa8443df38118f24ed46fd052b2f4a37b'
* commit '8797066aa8443df38118f24ed46fd052b2f4a37b':
Move API change details from highlights doc to version notes doc.
Add StreamSource, which wraps a SkStream to a DataSource.
Add SkOmxPixelRef, which holds a MediaBuffer.
Test OmxJpegImageDecoder by a Jpeg decoder bench.
Merge commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef' into eclair-plus-aosp
* commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef':
Bring up the soft keyboard when touching a focused textfield.
Merge commit 'dd8174928c9c2966b1491acd604612a3b38e600a' into eclair-plus-aosp
* commit 'dd8174928c9c2966b1491acd604612a3b38e600a':
Remove trackball double click. Treat each click as a single click.
