summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTao Bai <michaelbai@google.com>2014-07-23 19:39:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-23 19:39:51 +0000
commita365888c065bd31b2daaae9a2e241f9eabf352c5 (patch)
tree5ad07368f294ae93fd5085da63b13f2137a6214e /res
parent270a8abcbfb60b58736edf1353099e524b1703f6 (diff)
parent9971e3f4bad925e87fc7c4bd82a7e6b097ce3981 (diff)
downloadpackages_apps_Browser-a365888c065bd31b2daaae9a2e241f9eabf352c5.zip
packages_apps_Browser-a365888c065bd31b2daaae9a2e241f9eabf352c5.tar.gz
packages_apps_Browser-a365888c065bd31b2daaae9a2e241f9eabf352c5.tar.bz2
am 9971e3f4: Changes correspoding to Permission API change
* commit '9971e3f4bad925e87fc7c4bd82a7e6b097ce3981': Changes correspoding to Permission API change
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8a0fd49..bba4dbe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -858,7 +858,7 @@
<string name="permissions_prompt_allow">Allow</string>
<string name="permissions_prompt_deny">Deny</string>
<string name="permissions_prompt_remember">Remember preference</string>
- <string name="resource_geolocation">location</string>
+ <string name="resource_protected_media_id">protected media ID</string>
<string name="resource_video_capture">camera</string>
<string name="resource_audio_capture">microphone</string>
<string name="geolocation_permissions_prompt_message"><xliff:g id="website origin" example="maps.google.com">%s</xliff:g> wants to know your location</string>