merge heads

2012-04-06 10:54:22 -07:00
parent 79fde1c118
commit f5085b208d
319 changed files with 6180 additions and 5754 deletions
@@ -29,6 +29,7 @@ limitations under the License.
      android:layout_width="fill_parent"
      android:orientation="vertical">
      <ImageView
+        android:contentDescription="@string/my_tracks_app_name"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:scaleType="fitStart"