Merge commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505'
* commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505':
Modified the test case name for the browser page load test.
Merge commit 'dd205d14468b532395a2d9896dd550150f09cc23'
* commit 'dd205d14468b532395a2d9896dd550150f09cc23':
Don't forget to clear "backup in progress" state when finishing a pass
Merge commit '98b050d067037bd25ac81b75d46bf030c6d73b9e'
* commit '98b050d067037bd25ac81b75d46bf030c6d73b9e':
add new column "real_date" for IM messages table.
Merge commit '7df612ceb9edd01808cd74bd460a55b548df8010'
* commit '7df612ceb9edd01808cd74bd460a55b548df8010':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit 'a1414d1c5bd2c91571e83fb147c17996ec170555'
* commit 'a1414d1c5bd2c91571e83fb147c17996ec170555':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5'
* commit '528961a61d99280e67fbb13b78b3d2538c3025d5':
Handle expiration of discovery mode in system server.
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'
* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
When change from narrow screen to wide screen, we will
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'
* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'
* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
Add official assets for tabs in compatibility mode
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'
* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
Add auto-brightness mode to the list of backed-up settings
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e'
* commit '5cf07feb3df89e827324e1204674c4f3629eb27e':
Fix 2146581: Make tabs work for donut apps
Merge commit 'c321ab992d526cde098986d512ce4a051c486607'
* commit 'c321ab992d526cde098986d512ce4a051c486607':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
Merge commit 'c27d57182a5722aba51af700593852b4ab006653'
* commit 'c27d57182a5722aba51af700593852b4ab006653':
DO NOT MERGE: Cleaning up the PipedStreamTest
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf'
* commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf':
API XML changes to accompany dalvik.system deprecation.
Merge commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9'
* commit '434462f0c95b5f828ee9ab5e2fd86a73dd2c6fe9':
egl: temporarily also include eglTerminate->eglInitialize hack for 8k
Merge commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0' into eclair-plus-aosp
* commit '4b35d699e1ebd8f3d25b8300ff9c3923547f14d0':
Don't back up / restore "allow apps from unknown sources"
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp
* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
Modified the test case name for the browser page load test.
Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp
* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
Don't forget to clear "backup in progress" state when finishing a pass
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.
Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
Merge commit 'a46c138ab37e141f195d449f453dda8bd1df0947'
* commit 'a46c138ab37e141f195d449f453dda8bd1df0947':
Check for failure to create EGL surfaces and contexts.
Merge commit '5b2acbfcee2e424583ed69de5a94e6582b096d59'
* commit '5b2acbfcee2e424583ed69de5a94e6582b096d59':
Fix remaining object leaks. Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
