am c134c281: Merge change 9265 into donut

Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f'

* commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f':
  Highlight IMEI-reading as part of READ_PHONE_STATE description
This commit is contained in:
Android (Google) Code Review
2009-07-30 16:20:51 -07:00
committed by Android Git Automerger

View File

@@ -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>