diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-11 13:56:13 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-11-11 13:56:13 -0800 |
| commit | 0d00a83fcea7bf96e118d0271ed807a3f39f0bc4 (patch) | |
| tree | 62edf412a99d99f708a86b344e404b17bb443016 /res | |
| parent | 1d9c95c9d31f71519d72b60e5af9cd64822ed87b (diff) | |
| parent | ebf4b36e17dd0a63f293a618a6d1bcea98a69bd3 (diff) | |
| download | packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.zip packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.tar.gz packages_apps_nfc-0d00a83fcea7bf96e118d0271ed807a3f39f0bc4.tar.bz2 | |
resolved conflicts for merge of ebf4b36e to master
Change-Id: I73a3025a35da21db6600b6e82c99836641e9bee7
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/strings.xml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 42b76e2..903103a 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,13 +2,6 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name">Nfc Service</string> <string name="nfcUserLabel">Nfc</string> - - <!-- The label for the NFC admin permission --> - <string name="permlab_nfcAdmin">control NFC secure hardware</string> - - <!-- The description for the NFC admin permission --> - <string name="permdesc_nfcAdmin">Allows the app to control the secure hardware used with NFC, - for example, to modify payment credentials.</string> <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] --> <string name="inbound_me_profile_title">Contact received over NFC</string> |