Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -29,7 +29,6 @@ limitations under the License.
    android:layout_weight="1.0"
    android:layout_width="match_parent"
    android:text="@string/track_list_empty_message"
-    android:visibility="gone"
    style="@style/ListEmptyTextView" >
  </TextView>
  <include layout="@layout/track_controller" />