Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp
* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
Telephony: Fix radio state printing
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp
* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
Fix time zone info in kernel is nothing after reboot
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp
* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
New AppsPermission and market style
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp
* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
Include debugger connection status in error entry
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp
* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
GPS: Fix another race condition in GPS HAL initialization
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp
* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
bug:3082865 don't use IN to construct sql to delete downloads
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp
* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp
* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
Avoid pre-processing images when they won't be used
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp
* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.
Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.
Pruned some of the input dispatcher log output.
Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources. This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.
Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp
* commit '66e606040a521b81033ff75025620436c050c82e':
GPS: More HAL initialization cleanup
Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp
* commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp
* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
Don't perform DNS lookup in android.net.Proxy.isLocalHost
Merge commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9' into gingerbread-plus-aosp
* commit 'd14230f1c7aa5073db9d291f8fbd6da5491955b9':
Made paste work in ExtractEditText
Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp
* commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
GPS: Do not call sGpsInterface->init() multiple times
Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp
* commit 'dc2e5208e2b448a2c481d726818de79ea6a49783':
Do not release the wifi lock if the screen is off.
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp
* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread
* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9' into gingerbread-plus-aosp
* commit 'a827d7bc347ce6f1a0074dd9fe515919a35a38a9':
Other improvements to text cursor movement.
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp
* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
DO NOT MERGE Limit the height of the pull glow.
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp
* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
docs: a few style adjustments to admin doc
