Merging gingerbread changes to head.

2010-12-10 14:30:29 -02:00
parent 93b95954c4
commit 19d5fe1ba6
111 changed files with 5041 additions and 837 deletions
@@ -390,4 +390,16 @@ limitations under the License.
    <item>CSV</item>
    <item>TCX</item>
  </array>
+
+  <array name="sensor_type_options">
+    <item>None</item>
+    <item>Zephyr Bluetooth</item>
+  </array>
+
+  <!-- DO NOT TRANSLATE -->
+  <array name="sensor_type_values">
+    <item>@string/none</item>
+    <item>@string/zephyr_sensor_type</item>
+  </array>
+
 </resources>