Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'
* commit '9afeda0519c4f4892611565d678f01d269863bb8':
Manual merge of change 53051 from master (DO NOT MERGE)
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp
* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
Manual merge of change 53051 from master (DO NOT MERGE)
If the keystore daemon chdir's into /data/misc/keystore, /data can
never be unmounted. During bringup, it's helpful if we can umount
/data and reformat it.
Change-Id: Id5b93ee8a54846fd07e6e0e57bfd0a6fabf603ee
Merge commit '3f704e983e36c668a3a13690655ab809666dfc3e'
* commit '3f704e983e36c668a3a13690655ab809666dfc3e':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'
* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
docs: small edits to catchup to edits made in html pushed live
Merge commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'
* commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab':
When filling the cache, we always time out waiting for a condition that won't occur.
Merge commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp
* commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp
* commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
docs: small edits to catchup to edits made in html pushed live
Merge commit '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp
* commit '2bc481861ab374f87c12b7bb816ff75ac46147f1':
When filling the cache, we always time out waiting for a condition that won't occur.
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread
* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread
* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
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.
