summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-11-21 21:08:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 21:08:27 -0800
commit772130a3db390936a4ad448c56780f167eaa401f (patch)
tree0c71de8383a6a6ca07533feb1b9edc4f0524cc0e /res
parentac9b34c8331ad78221172cb36e9e1664a81df5e9 (diff)
parente1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d (diff)
downloadpackages_apps_nfc-772130a3db390936a4ad448c56780f167eaa401f.zip
packages_apps_nfc-772130a3db390936a4ad448c56780f167eaa401f.tar.gz
packages_apps_nfc-772130a3db390936a4ad448c56780f167eaa401f.tar.bz2
am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit 'e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d': Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 903103a..8732476 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">Nfc Service</string>
- <string name="nfcUserLabel">Nfc</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>