merge heads

This commit is contained in:
Jimmy Shih
2011-11-10 16:08:35 -08:00
31 changed files with 286 additions and 471 deletions
-1
View File
@@ -61,7 +61,6 @@ limitations under the License.
<!-- Keys for non-persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
<string name="ant_options_key">antOptions</string>
<string name="backup_to_sd_key">backupToSd</string>
<string name="display_settings_screen_key">displaySettingsScreen</string>
<string name="reset_key">resetToDefaults</string>
<string name="restore_from_sd_key">restoreFromSd</string>
<string name="sensor_options_key">sensorOptions</string>