Merge heads

2013-07-03 11:19:22 +08:00
parent 7bee6470bd
commit b4e94b9af1
53 changed files with 135 additions and 60 deletions
@@ -61,7 +61,7 @@ limitations under the License.
      android:layout_height="0dp"
      android:layout_weight="10"
      android:layout_width="match_parent"
-      android:src="@drawable/btn_stop_1" />
+      android:src="@drawable/btn_stop_0" />
    <View
      android:layout_height="0dp"
      android:layout_weight="1"