Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp
* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
Expose some debugging tools of the WebView.
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp
* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
Fix pairings lost on reboot.
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
This change applies the fix -- originally by phanna in
https://android-git.corp.google.com/g/#change,33669 -- to
the com.android.internal.widget version of DigitalClock,
which is used by the keyguard and pattern lock screens.
Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp
* commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed. This was possible because these are different
IPC interfaces so will not be serialized. The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.
Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp
* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp
* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp
* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp
* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
fix bad link in javadoc that's breaking SDK build
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp
* commit 'eb114de5037bba89333bd7d57d305ae989727096':
Make vCard exporter append neighborhood to locality field instead of extended address,
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp
* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
If overview width is the same as the current width,
Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp
* commit 'f61ab00770c6010d83280644263d6f530c75028e':
-hide AccountManagerResponse, which never should have been exposed in the first place
Also sets an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=2271636
Change-Id: Ife478917a979b68e242c467798358a018455957f
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp
* commit '8250530c507653d57c768677d8a542cd769aaf99':
Add Gservices flag so that Market can turn on performance logging for specific groups.
