Merge commit '7472788a87f8cc758cd534d960d178a1481c4cfb'
* commit '7472788a87f8cc758cd534d960d178a1481c4cfb':
Text specifies "android:codeName" which doesnt exist, should be "android:versionName"
Merge commit '5cf8d00f0c1f511a769c171843dfd3427312b99a'
* commit '5cf8d00f0c1f511a769c171843dfd3427312b99a':
PowerManagerService: Use 5 cm threshold for the proximity sensor.
Merge commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762'
* commit 'e8f77e69c095ff029c114159d8ae7ecb3b10d762':
Fix 2083478: Camera needs an auto-focus cancel API
Merge commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e'
* commit 'ce063a3510ed5764edda02ae1d22f4540b632e4e':
Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
Merge commit '515a10c4b3022899a54b9c9f5ad1f46eb69c612a'
* commit '515a10c4b3022899a54b9c9f5ad1f46eb69c612a':
add support for RGBX_8888 surfaces in SurfaceFlinger
Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'
* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
Last big work on #1991910: Make swipes work with capacitive keys
Merge commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59'
* commit '23b141efe5d63bd3859aba4ffa0533cb6fad0c59':
Fix issue #2116977: buttons are huge and bent
Merge commit '426ec7f30679c813350c18bdae125fce5b1c7725'
* commit '426ec7f30679c813350c18bdae125fce5b1c7725':
add system properties for experimenting with sync timeouts.
Merge commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b'
* commit 'dc0ec6d6da1a330a292d49ab97a47f9218222f9b':
Clear the password field when reloading the current page.
Merge commit 'b942000592bbf5fb309fe906f079a6f8b3f03b97'
* commit 'b942000592bbf5fb309fe906f079a6f8b3f03b97':
fix [2117464] SF can crash when calling dumpsys
Merge commit '1a82f5705b04e0e410fc0f7d6445446e0c493caf'
* commit '1a82f5705b04e0e410fc0f7d6445446e0c493caf':
make sure to update the tail pointer when undoing a dequeue
Merge commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1'
* commit '1ff4cdadd5d704764bd6f822c42a2517b9b675b1':
Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
Merge commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030'
* commit 'd5b281f4b4e018a41846f1e81d02e75059bf7030':
process: Switch to common cutils sched_policy api
Merge commit 'db9932c235afa0895fef80584b4813befe79d5c3'
* commit 'db9932c235afa0895fef80584b4813befe79d5c3':
Fix the bogus crashes in layout and reliability tests (the device actually went offline).
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
