merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -87,7 +87,7 @@ limitations under the License.
      android:text="@string/about_support"
      style="@style/AboutLabel"/>
    <TextView
-      android:text="@string/my_tracks_web_url"
+      android:text="@string/my_tracks_support_url"
      style="@style/AboutUrl"/>

    <!--  Privacy -->