Merge branch 'master' into google

wjc

9 小时以前 0ccb78cfb85fbba31ee16a57b13752747585b9a9

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_13" />
    <solid android:color="@color/text_FFACACAC" />
 
</shape>