Merge commit '08878156e6239cf1dd03bfbd4a108bcefad16b17'
* commit '08878156e6239cf1dd03bfbd4a108bcefad16b17':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit 'a2d259aa4a06eb92af2ef4530ae065497a581496' into eclair-mr2-plus-aosp
* commit 'a2d259aa4a06eb92af2ef4530ae065497a581496':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-mr2
* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
* changes:
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd'
* commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
Merge commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16' into eclair-mr2-plus-aosp
* commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
* changes:
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix to a race condition) that breaks the caching of non-existent Settings/Secure/ Gservices values (causing lots of unnecessary database queries).
Merge commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a'
* commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit 'df7edf5d92ae3e708e802b68014864fe13184060' into eclair-mr2-plus-aosp
* commit 'df7edf5d92ae3e708e802b68014864fe13184060':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2
* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp
* commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8':
Add China data to MccTable.
Merge commit '40f92fe967f36d524d173b7819dc875af2cd9971'
* commit '40f92fe967f36d524d173b7819dc875af2cd9971':
When using MDP, we needed to use a texture for diming.
Merge commit '1e22cffa1d7299e725ec2a16689901aaa5790922' into eclair-mr2-plus-aosp
* commit '1e22cffa1d7299e725ec2a16689901aaa5790922':
When using MDP, we needed to use a texture for diming.
Merge commit 'b29fefe6aeed68c22c7711263357348006ab8b79' into eclair-mr2-plus-aosp
* commit 'b29fefe6aeed68c22c7711263357348006ab8b79':
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-mr2
* commit '638514048141bf9f28a4bede77b83c3238f5c194':
When using MDP, we needed to use a texture for diming.
* changes:
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg. (In preparation for not copying to /data/dontpanic/last_kmsg at all.)
Merge commit 'e982185f3403c7ca693944ebc5529d53581acf75'
* commit 'e982185f3403c7ca693944ebc5529d53581acf75':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp
* commit '20342ca83012b442913b409a9218635de9bd6aa6':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2
* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2'
* commit 'e4df64bdaaf86fb7d06715de122a97d723d7fea2':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp
* commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2
* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp
* commit '2464acc6da6393f0163894094468f68b8e496cea':
moved the gdata library to vendor/google
Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp
* commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2
* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit '627765245bb89bc590a1cecaaf935414f076618b'
* commit '627765245bb89bc590a1cecaaf935414f076618b':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp
* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
