Merge branch '1.3.1' into google

wjc

6 天以前 99fe0cdba240f67e75e3d051e51fa61d71188cab

1
2
3
4
5
6
7
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF000000">
 
</LinearLayout>