Merge commit '59a2c2958d0bcc00402ebb961b02368004117e3b' into eclair-plus-aosp
* commit '59a2c2958d0bcc00402ebb961b02368004117e3b':
Black is the new black
Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp
* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
Keep the scrollbar on during TOUCH_MOVE events even
Merge commit 'c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp
* commit 'c868acf442a69429056a574c67a5e0187e2b9536':
show events in the UI
Merge commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28' into eclair-plus-aosp
* commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28':
Try to reconnect twice when the rfcomm error code is Connection Refused.
Merge commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065' into eclair-plus-aosp
* commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065':
Add the signature checking for WebView plugins. The
Merge commit '5e5001bc1a065f6d578b953b908052d623272fcd' into eclair-plus-aosp
* commit '5e5001bc1a065f6d578b953b908052d623272fcd':
Add documentation for scene mode. Other parameters may be changed after setting scene mode.
Merge commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37' into eclair-plus-aosp
* commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37':
Add Turkish accented letters for G and S on the hard keyboard.
Merge commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea' into eclair-plus-aosp
* commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea':
Set Sink State when ACL disconnects.
Merge commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d' into eclair-plus-aosp
* commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d':
Fix padding around QuickContactBadge in ContactHeaderWidget
Merge commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01' into eclair-plus-aosp
* commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01':
Fix 2133205: Change the opacity to allow more of the background to be seen on locked screen
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp
* commit '436344ae12c819f58306ceb94241a266141e1218':
Turn off most of the backup-related debug logging
Merge commit '10be7542327e1d4483b33730164e5404ed48d73e' into eclair-plus-aosp
* commit '10be7542327e1d4483b33730164e5404ed48d73e':
If the textfield is offscreen at the end of a zoom, remove it.
This happens when the the remote headset is in a bad state or is
not accepting connections. Try twice before giving up.
Change-Id: I55e15bad6b72904b8e4ccbca89e17e9bd3ddb61e
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.
Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
Stop using SIM card icons for USB notifications
Fixes b/1700510
Change-Id: Ic7e251a7ecad3ed46044181eae41481791df85bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp
* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
Check if rename of backed up file fails before persisting new changes.