merge heads

2011-11-10 16:26:30 -08:00
parent f19482985d
commit cc4d57bc0c
6 changed files with 89 additions and 0 deletions
@@ -25,6 +25,7 @@ limitations under the License.
  <string name="bluetooth_device_key">bluetoothDevice</string>
  <string name="bluetooth_pairing_key">bluetoothPairing</string>
  <string name="bluetooth_sensor_key">bluetoothSensor</string>
+  <string name="default_activity_key">defaultActivity</string>
  <string name="default_map_public_key">defaultMapPublic</string>
  <string name="max_recording_distance_key">maxRecordingDistance</string>
  <string name="metric_units_key">metricUnits</string>