调整
Merge branch 'master' of
https://github.com/minggo620/battery_notification_baiduAd.git

Conflicts:
	battery_notification/AndroidManifest.xml