Commit 3046ab41 authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java
parents fd4b5efb 0749c5f7
Pipeline #1381 canceled with stages