Merge heads

This commit is contained in:
youtaol
2012-06-04 13:20:38 +08:00
parent cad1a105ca
commit 953bd8b908
22 changed files with 325 additions and 306 deletions
+2 -2
View File
@@ -29,8 +29,8 @@ limitations under the License.
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/stats_use_total_time_key"
android:summaryOff="@string/stats_total_time"
android:summaryOn="@string/stats_moving_time"
android:summaryOff="@string/stats_moving_time"
android:summaryOn="@string/stats_total_time"
android:title="@string/settings_stats_time_title" />
<PreferenceCategory android:title="@string/settings_show" >
<CheckBoxPreference