Merge heads

2013-02-26 10:51:24 +08:00
parent d740f5a09d
commit da04450a2b
40 changed files with 326 additions and 182 deletions
@@ -74,6 +74,10 @@ limitations under the License.
    android:icon="@drawable/menu_settings"
    android:id="@+id/track_list_settings"
    android:title="@string/menu_settings"/>
+  <item 
+    android:icon="@drawable/menu_feedback"
+    android:id="@+id/track_list_feedback"
+    android:title="@string/menu_feedback"/>
  <item
    android:icon="@drawable/menu_help"
    android:id="@+id/track_list_help"