Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -22,7 +22,7 @@ limitations under the License.
    android:orientation="vertical"
    android:padding="8dp" >
    <TextView
-      android:drawableLeft="@drawable/my_tracks_icon"
+      android:drawableLeft="@drawable/ic_launcher_my_tracks"
      android:text="@string/about_copyright_notice"
      style="@style/TextMedium.WithIcon" />
    <TextView