Merge heads

This commit is contained in:
youtaol
2012-06-20 09:45:23 +08:00
parent f1a3c5dffa
commit 978b6c5a09
123 changed files with 2475 additions and 5323 deletions
+8
View File
@@ -47,5 +47,13 @@ limitations under the License.
android:key="@string/settings_sensor_ant_reset_speed_distance_monitor_key"
android:persistent="false"
android:title="@string/settings_sensor_ant_reset_speed_distance_monitor" />
<Preference
android:key="@string/settings_sensor_ant_reset_bike_cadence_sensor_key"
android:persistent="false"
android:title="@string/settings_sensor_ant_reset_bike_candence_sensor" />
<Preference
android:key="@string/settings_sensor_ant_reset_combined_bike_sensor_key"
android:persistent="false"
android:title="@string/settings_sensor_ant_reset_combined_bike_sensor" />
</PreferenceCategory>
</PreferenceScreen>