Merge commit 'ef1a198350030a32e1d1a3dc9a94013ef18b2551'

MacBuilder

2018-09-26 c1f0326d9f1d36a705932ecd123246ae8642d35d

 ChannelDiff/Android/mrgame/AndroidManifest.xml

@@ -92,7 +92,7 @@
            android:value="_mrgame" />
        <meta-data
            android:name="Mr_GAME_ID"
            android:value="_498" />
            android:value="_559" />

        <!-- Required SDK 核心功能 -->
        <!-- 可配置android:process参数将PushService放在其他进程中 -->