Merge heads

This commit is contained in:
youtaol
2012-06-04 13:20:38 +08:00
parent cad1a105ca
commit 953bd8b908
22 changed files with 325 additions and 306 deletions
+2 -2
View File
@@ -36,7 +36,7 @@ limitations under the License.
android:id="@+id/track_list_import"
android:title="@string/menu_import"/>
<item
android:icon="@drawable/menu_save_all"
android:icon="@drawable/menu_save"
android:id="@+id/track_list_save_all"
android:title="@string/menu_save_all">
<menu>
@@ -47,7 +47,7 @@ limitations under the License.
</menu>
</item>
<item
android:icon="@drawable/menu_delete_all"
android:icon="@drawable/menu_delete"
android:id="@+id/track_list_delete_all"
android:title="@string/menu_delete_all"/>
<item