merge heads

2011-11-10 16:51:10 -08:00
parent 44e81383f9
commit 23b5f879ae
34 changed files with 378 additions and 473 deletions
@@ -119,7 +119,7 @@ limitations under the License.
      android:autoLink="web"
      android:layout_height="wrap_content"
      android:layout_width="wrap_content"
-      android:text="@string/about_weburl"
+      android:text="@string/my_tracks_web_url"
      android:textSize="18sp" />
  </TableRow>