Merge commit 'e48629bda8952502013db4dec2cccd7ca7308783'

MacBuilder

2018-08-28 6f5a7b2cf52e2816d664ddaa14dc76b5c2d5d0a3

 ChannelDiff/813015059/AndroidManifest.xml

@@ -239,7 +239,7 @@
        <!-- Required. AppKey copied from Portal -->
        <meta-data
            android:name="JPUSH_APPKEY"
            android:value="a0d746ccb32b9b0e5ce7c7be" />
            android:value="63f9523bf41727aaccfd258f" />
    </application>

</manifest>