Merge commit 'd86f58a93e14f6f187aa25d6714503af177031eb' into gingerbread-plus-aosp
* commit 'd86f58a93e14f6f187aa25d6714503af177031eb':
Import revised translations. DO NOT MERGE
Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp
* commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b':
Add confirmation when stopping system service, as per rwest.
Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp
* commit '84c8c175c8ee797f61121211c3ef8638d127cdf6':
Import revised translations. DO NOT MERGE
Merge commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c'
* commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c':
Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp
* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'
* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
Separate the Settings activity name into two different strings.
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp
* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
Separate the Settings activity name into two different strings.
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.
Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp
* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
Import revised translations. DO NOT MERGE
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp
* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
New assets for power widget: gps, sync
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp
* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
Revise the Language & keyboard settings layout.
Changed the input type of the APN name text field
from email adress to plain text to facilitate the
input method choosing input after locale and not
restricting the input to latin characters. There is
no reason to restrict the APN name to latin
characters only.
Change-Id: Ib85fa980407a67112fd91e744b0dc0632d5c907e
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.
Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp
* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
Trim unwanted whitespace from translations. DO NOT MERGE