Automated merge with http://mytracks.googlecode.com/hg/

2011-09-21 16:17:01 -07:00
parent 6ab1f6158a
commit 4f9b6535fb
6 changed files with 62 additions and 15 deletions
@@ -53,4 +53,5 @@ limitations under the License.
  <string name="reset_key">resetToDefaults</string>
  <string name="sensor_options_key">sensorOptions</string>
  <string name="ant_options_key">antOptions</string>
+  <string name="display_settings_screen_key">displaySettingsScreen</string>
 </resources>