am b19daff9: am 2601cd91: Implement proper settings restrictions

* commit 'b19daff9cb6f04a71343f858a0c44415412b8049':
  Implement proper settings restrictions
This commit is contained in:
Amith Yamasani
2013-03-31 18:25:07 -07:00
committed by Android Git Automerger
6 changed files with 177 additions and 210 deletions

View File

@@ -4445,7 +4445,7 @@
<!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
<string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
<!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
<string name="restriction_location_enable_title">NFC</string>
<string name="restriction_location_enable_title">Location access</string>
<!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
<string name="restriction_location_enable_summary" >Let apps use your location information</string>