Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -62,7 +62,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:layout_weight="10"
      android:layout_width="0dp"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
    <View
      android:layout_height="match_parent"
      android:layout_weight="1"