summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2014-01-14 23:33:32 -0800
committerWei Wang <weiwa@google.com>2014-01-14 23:42:41 -0800
commitab4029665bf231459b6a0da34a47e795412c7a57 (patch)
treec6abf683bf0d75c8d9699472f72001223539d40a
parenteeb60f9473f2e070228cfaec75e757413a50dcba (diff)
parentf4f8d9f34669bc67b8cd93e7dc060dfddf3a7e51 (diff)
downloadpackages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.zip
packages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.tar.gz
packages_apps_Settings-ab4029665bf231459b6a0da34a47e795412c7a57.tar.bz2
Merge commit 'f4f8d9f3' into manualmerge
Conflicts: res/values/strings.xml Change-Id: Ifbcd6ef2447dbb95aab0ed1971f63a16ecf8035c
-rw-r--r--res/values/strings.xml7
1 files changed, 0 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a9d25f5..f041f6f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -330,13 +330,6 @@
<string name="bluetooth_ask_lasting_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
<string name="bluetooth_ask_lasting_discovery" product="default">An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
- <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
- <string name="bluetooth_ask_start_broadcast" product="default"><xliff:g id="app_name">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings.</string>
- <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
- <string name="bluetooth_ask_enablement_and_start_broadcast" product="default"><xliff:g id="app_name">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings.</string>
- <!-- Strings for bluetooth broadcasting explanation -->
- <string name="bluetooth_broadcasting_explaination" product="default">When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals.</string>
-
<!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings.</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings.</string>