Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp
* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
Add a configuration option to turn on the screen when you unplug the device.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp
* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread
* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
Revert "docs: new web apps dev guides" Do not merge.
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp
* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
fix a bug where FLIP_H would do a 180 rotation
Several people are seeing odd behaviors around backup/restore at present.
Enable expanded logging to help pin down exactly what is happening.
Change-Id: I95ca013017cb07e633f2ba765583de3cf0e056af
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp
* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
deliver invalidate messages AFTER other messages
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.
Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp
* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
Don't throw when userActivity fails because of the permission check.
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp
* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
Go one day into 1970 for timezone code.
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp
* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
On boot, advance time to at least 1970.
Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp
* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
fix a bug where timeouts would only be handled when a message was delivered
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '1010da2e02216b2f94fbe763a82d53201b340217':
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.
Otherwise various Java APIs start doing their documented "correct"
thing, which is to fail.
Bug: 3081605
Change-Id: I90f8cde745d2ddab78419e37f60eea1e81a58127
Previously a tight loop of StrictMode violations would still allocate
Exception objects and populate their stack frames, just to orphan them
later when checking the max-10-violations-per-loop constraint.
With this patch, we do that check _before_ allocating any memory.
Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp
* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
Add mock ril control commands and tests
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp
* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
Hold partial wakelock during shutdown to avoid entering sleep
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
