* changes:
Provide a useful message in DumpRenderTree2 GUI when the host server is not running
Prevent DumpRenderTree2 from crashing when the host server is not running
This updates the strorage locations to better match those used by the
Android HTTP stack.
The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643
Bug: 3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'
* commit '4e9243d55ce183542c74550e503ea583643599a0':
Updated assets in status bar. DO NOT MERGE.
Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550'
* commit 'd0cb228b9af0b67fa3372ee075287e7409249550':
squeeze a few more bits of randomness into /dev/random
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'
* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'
* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'
* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
Revert previous status bar assets. DO NOT MERGE.
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'
* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
DO NOT MERGE Clarify the explanation of Android's security design.
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field. This is for HC, but doing in GB to avoid introducing
integration issues.
Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
This is a manual cherrypick of:
Change I3a76de15: Fixing font scale in WindowManagerService. There was
a bug that causes WindowManagerService to lose the fontScale setting.
Change-Id: I9b993e11f6a3e75735d8ed05596083893543d732
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Unlock has a 1 pixel offset that has to be fixed by code.
dropdown untested on device.
Most of these should be removed from SystemUI (revert 68833).
Pass 4.
Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
