Merge commit '14854820eac895a925791fb41ccd330447fd4f02'
* commit '14854820eac895a925791fb41ccd330447fd4f02':
Add a configuration option to turn on the screen when you unplug the device.
Merge commit 'ad9a559c611a2901a490c887f03d9622695beba2'
* commit 'ad9a559c611a2901a490c887f03d9622695beba2':
Revert "docs: new web apps dev guides" Do not merge.
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp
* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
Add text selection handles to preloaded drawables.
This change detects empty quads in 9patches and removes them from
the mesh to avoid unnecessary blending.
Change-Id: I4500566fb4cb6845d64dcb59b522c0be7a0ec704
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp
* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
Add versionCode and versionName to dumpsys packages
Merge commit 'fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp
* commit 'fb6431c0298747d240fcdc025575e5f46db95132':
Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp
* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
fix start driver for corner cases DO NOT MERGE
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
Remove dead code, and make the animation a setting.
turn off the electron beam
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp
* commit '354954a01c533c6789536c141cf330ddf3976e8b':
Doc change: cherrypick testing changes from master. Squashed commit of the following:
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78'
* commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78':
fix a bug where FLIP_H would do a 180 rotation
Bug #3089972
This change also adds the ability to control the ListView's fling
velocity by introducing a new scale factor.
Change-Id: I4030d3fe3688f72b2b8250ac85bbf000e9adc883
Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'
* commit '5be893a71aa72f54660496dd01cfad66adb86b8f':
Don't throw when userActivity fails because of the permission check.
The recipient app could be receiving drag location updates faster than
it handled them, leading to progressive poor responsiveness. Now we
discard any undelivered pending location updates and replace them with
the newest data point when the location is updated.
Change-Id: I7299d205a0ef8ef8f5f32fd14e9ef87383d92717
* Fix up ButtonGroup to behave better.
* Fix bad states with holo list selectors.
* Clean up action mode UI components.
* Change action mode UI to use a text button instead of 'X' to dismiss.
* Fixed spinner dropdowns for Holo.Light
Change-Id: Ifc092bd549ffb539d6a3b2ddd95ebd4b114a441f
Merge commit '8b8a8f65b5306aa557028feba7317470222a73df'
* commit '8b8a8f65b5306aa557028feba7317470222a73df':
fix a bug where timeouts would only be handled when a message was delivered
Merge commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5'
* commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
