Merge heads

2013-10-30 11:16:07 +08:00
parent 7823ca4eec
commit 7cc1f878b4
12 changed files with 172 additions and 99 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
  android:paddingBottom="4dp"
  android:paddingLeft="24dp"
  android:paddingTop="32dp"