Merge branch 'master' into leonard

client_Wu Xijin

2018-11-05 1cee93d63f19fd4e961b47f23cfa7621833e7d7f

1
2
3
4
<?xml version="1.0" encoding="utf-8"?>
<resources
    xmlns:tools="http://schemas.android.com/tools"
    tools:keep="@layout/getui_notification,@drawable/push,@drawable/push_small"/>