merge heads

This commit is contained in:
Jimmy Shih
2011-12-09 13:53:16 -08:00
parent ca889ee04c
commit 456fa03f8e
82 changed files with 14596 additions and 2620 deletions
+2 -4
View File
@@ -1158,10 +1158,8 @@ limitations under the License.
translation_description="When sending a track to Google, a note indicating it is created by
My Tracks on Android.
%1$s: the html anchor opening tag, '<a href=\'http://mytracks.appspot.com\'>'. Please
place this placeholder before the app name, 'My Tracks'.
%2$s: the html anchor closing tag, '</a>'. Please place this placeholder after the app
name, 'My Tracks'.">
%1$s: the html anchor opening tag, Place this placeholder before the app name, 'My Tracks'.
%2$s: the html anchor closing tag, Place this placeholder after the app name, 'My Tracks'.">
Created by %1$sMy Tracks%2$s on Android.
</string>
<string name="send_google_choose_account_title"
+1 -1
View File
@@ -44,7 +44,7 @@ limitations under the License.
<!-- Button -->
<style name="Button">
<item name="android:layout_height">48dip</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_width">0dip</item>
<item name="android:maxLines">2</item>