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

WeiChat/src/main/res/layout/plat_oamain.xml

@@ -77,7 +77,6 @@
                         android:layout_marginTop="2dp"
                         android:layout_weight="1"
                         android:orientation="vertical">
-
                         <ImageView
                             android:id="@+id/oamain_more_menu_iv"
                             android:layout_width="match_parent"