diff options
| author | Adam Powell <adamp@google.com> | 2012-06-03 14:52:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-03 14:52:59 -0700 |
| commit | dd0a64a9ba1c8536337d69d4de55d5c8b133c75d (patch) | |
| tree | 15b702eaa7f5994136947db3f8f7d60cfde05012 /core | |
| parent | bdc177271ac8484d92218221a0166a273e6e6a10 (diff) | |
| parent | 757b3c274ef0df765bcbc351a64367ed39e69369 (diff) | |
| download | frameworks_base-dd0a64a9ba1c8536337d69d4de55d5c8b133c75d.zip frameworks_base-dd0a64a9ba1c8536337d69d4de55d5c8b133c75d.tar.gz frameworks_base-dd0a64a9ba1c8536337d69d4de55d5c8b133c75d.tar.bz2 | |
am 757b3c27: Fix ordering of product-specific strings
* commit '757b3c274ef0df765bcbc351a64367ed39e69369':
Fix ordering of product-specific strings
Diffstat (limited to 'core')
| -rwxr-xr-x | core/res/res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 8440054..ec8634a9 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3568,14 +3568,14 @@ from the activity resolver to use just this once. [CHAR LIMIT=25] --> <string name="activity_resolver_use_once">Just once</string> - <!-- Name of the default audio route when nothing is connected to - a headphone or other wired audio output jack. [CHAR LIMIT=25] --> - <string name="default_audio_route_name" product="default">Phone speaker</string> - <!-- Name of the default audio route for tablets when nothing is connected to a headphone or other wired audio output jack. [CHAR LIMIT=25] --> <string name="default_audio_route_name" product="tablet">Tablet speakers</string> + <!-- Name of the default audio route when nothing is connected to + a headphone or other wired audio output jack. [CHAR LIMIT=25] --> + <string name="default_audio_route_name" product="default">Phone speaker</string> + <!-- Name of the default audio route when wired headphones are connected. [CHAR LIMIT=25] --> <string name="default_audio_route_name_headphones">Headphones</string> |