summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-30 16:20:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-30 16:20:51 -0700
commitf0f6c51e13fae7522c401409afad98b64fbc33d8 (patch)
treec04bfe986af981fcecbe7a0950a01945e6df7f58 /core/res
parent992c1ebda18ac23c905d61d309dc8cdf9a030267 (diff)
parentc134c281ca83a28deb96c7b338c48c0b0327f26f (diff)
downloadframeworks_base-f0f6c51e13fae7522c401409afad98b64fbc33d8.zip
frameworks_base-f0f6c51e13fae7522c401409afad98b64fbc33d8.tar.gz
frameworks_base-f0f6c51e13fae7522c401409afad98b64fbc33d8.tar.bz2
am c134c281: Merge change 9265 into donut
Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f' * commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f': Highlight IMEI-reading as part of READ_PHONE_STATE description
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 549b668..558d91e 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -916,12 +916,12 @@
you.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permlab_readPhoneState">read phone state</string>
+ <string name="permlab_readPhoneState">read phone state and identity</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_readPhoneState">Allows the application to access the phone
features of the device. An application with this permission can determine the phone
- number of this phone, whether a call is active, the number that call is connected to
- and the like.</string>
+ number and serial number of this phone, whether a call is active, the number that call
+ is connected to and the like.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_wakeLock">prevent phone from sleeping</string>