Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

4 天以前 0f56aa60f9d6a779790f5f490cc8d3f3a39cf4aa

 keyCabinet-android/app/src/main/res/layout/offline_activation_activity.xml

@@ -191,7 +191,7 @@
                    android:layout_below="@+id/accredit_setTv"
                    android:layout_marginTop="20dp"
                    android:gravity="center"
                    android:textColor="@color/white" />
                    android:textColor="@color/black" />

                <View
                    android:id="@+id/aaccredit_view"