Merge heads

2012-06-04 13:20:38 +08:00
parent cad1a105ca
commit 953bd8b908
22 changed files with 325 additions and 306 deletions
@@ -34,6 +34,7 @@ limitations under the License.
      style="@style/ListEmptyTextView" >
    </TextView>
    <ImageButton
+      android:background="@color/transparent"
      android:contentDescription="@string/menu_record_track"
      android:id="@+id/track_list_record_button"
      android:layout_height="wrap_content"