Merge branch 'master' into 1.2.1_google

wjc

昨天 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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