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.
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp
* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
Fix pointer index when splitting secondary pointers.
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp
* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
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
Changing package at hackbod's request. I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.
Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
The dump function whitelists several directories as filters to the output.
The mount point changed for SD card in Froyo, and we started filtering files
that were open on the SD card. This fix changes the filter for the SD card,
and adds the directory for data files as well.
Change-Id: I61b67c3d11d93dbd530e8b3566000e79bc037137
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
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp
* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp
* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp
* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
Revert previous status bar assets. DO NOT MERGE.
