Merge branch 'master' into 1.2.1_google

wjc

1 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

 app/src/main/res/layout/dialog_confirm_cancel.xml

@@ -37,7 +37,7 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_18"
            android:layout_marginTop="@dimen/dp_15"
            android:layout_marginEnd="@dimen/dp_20"
            android:layout_marginBottom="@dimen/dp_25"
            android:gravity="center"