Merge heads

This commit is contained in:
youtaol
2012-06-11 10:34:48 +08:00
parent 4bf87acb80
commit 56475a943f
55 changed files with 232 additions and 196 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ limitations under the License.
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/settings_recording" >
<ListPreference
android:defaultValue="@string/settings_recording_track_name_date_local_value"
android:defaultValue="@string/settings_recording_track_name_location_value"
android:entries="@array/track_name_options"
android:entryValues="@array/track_name_values"
android:key="@string/track_name_key"