Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp
* commit 'e899caf8cce1d1a20121f19a99899553ae2b327e':
Fixed api/current.xml after a bad merge.
Merge commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00'
* commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00':
Even more native input dispatch work in progress.
Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp
* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
Even more native input dispatch work in progress.
Merge commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2'
* commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2':
New API for high-priority Notifications and full-screen alerts.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.
Modified the internal representation of MotionEvent to be more
efficient and more consistent.
Added code to skip/cancel virtual key processing when there are multiple
pointers down. This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).
Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
Merge commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp
* commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
New API for "immersive" activity windows.
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp
* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
New API for high-priority Notifications and full-screen alerts.
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'
* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'
* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp
* commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17':
TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp
* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread
* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread
* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'
* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp
* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'
* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
Remove hard-coded number of audio channels in AudioSource
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit 'c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.