summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-05-16 15:51:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-16 15:51:46 -0700
commit05d74c949fb8d0ed743cb356f2e5999708b2566f (patch)
tree45967897d38ad13264883fa3325385230c733518 /res
parent4942be03fe7bf529f60f228eede31a8559e03655 (diff)
parent402da07068333f9393fd960a4c90df39b34bf668 (diff)
downloadpackages_apps_nfc-05d74c949fb8d0ed743cb356f2e5999708b2566f.zip
packages_apps_nfc-05d74c949fb8d0ed743cb356f2e5999708b2566f.tar.gz
packages_apps_nfc-05d74c949fb8d0ed743cb356f2e5999708b2566f.tar.bz2
Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d25943..06cc01c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,7 +19,7 @@
<string name="accessibility_nfc_enabled">NFC enabled.</string>
<string name="touch">Touch to beam</string>
- <string name="beam_progress">Beam in progress</string>
+ <string name="beam_progress">Incoming beam...</string>
<string name="beam_complete">Beam complete</string>
<string name="beam_failed">Beam failed</string>
<string name="beam_touch_to_view">Touch to view</string>