Merging to head.

This commit is contained in:
Rodrigo Damazio
2011-04-12 01:42:27 -03:00
parent 3501fff7fc
commit 28a5c5b343
40 changed files with 1701 additions and 996 deletions
+2 -2
View File
@@ -48,8 +48,8 @@ limitations under the License.
android:key="@string/split_frequency_key"
android:title="@string/settings_split_frequency"
android:summary="@string/settings_split_frequency_summary"
android:entries="@array/split_frequency_options"
android:entryValues="@array/split_frequency_values"
android:entries="@array/task_frequency_options"
android:entryValues="@array/task_frequency_values"
android:defaultValue="0" />
<com.google.android.apps.mytracks.IntegerListPreference