Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp
* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
Do not deference before null check
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp
* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
Doc change: Add nexus one to dev phones.
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread
* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
Doc change: Add nexus one to dev phones.
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp
* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
Add missing word from docs.
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.
Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data. This could cause strange
behavior on secondary pointer up events.
Also added finished callback pooling in InputQueue.
Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp
* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
Make the systemui process persistent.
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp
* commit '8b61b68b648985df37197de204398f608c4ad8b1':
Only install after MCS success
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp
* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
StrictMode: time violations in Binder calls
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp
* commit '432c5b6c1d4181194cb82a14107b6d10105231a9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Merge commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit 'a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp
* commit 'a4fd0078d138b433d2250a74833ee3cc6424143a':
Clear preferred activities when home process crashes
