Merge heads

This commit is contained in:
youtaol
2012-05-18 10:32:51 +08:00
parent 2be5a6732a
commit fb4f6bb91e
5 changed files with 28 additions and 20 deletions
+5
View File
@@ -581,6 +581,11 @@ limitations under the License.
translation_description="In the 'Terms of Service' dialog, the button to accept.">
Accept
</string>
<string name="eula_copyright_year"
translation_description="The copyright year in the 'Terms of Service'. See
http://m.google.com/toscountry. \u00A9 is the unicode value for the copyright symbol.">
\u00A92012
</string>
<string name="eula_decline"
translation_description="In the 'Terms of Service' dialog, the button to decline.">
Decline
+1
View File
@@ -25,6 +25,7 @@ limitations under the License.
android:title="@string/settings_recording_track_name" />
<com.google.android.apps.mytracks.AutoCompleteTextPreference
android:defaultValue=""
android:hint="@string/track_edit_activity_type_hint"
android:key="@string/default_activity_key"
android:summary="@string/settings_recording_default_activity_summary"
android:title="@string/settings_recording_default_activity" />