# Conflicts:
#	AndroidManifest.xml
#	pages/advance/advance.vue
#	uni_modules/uts-alert/utssdk/app-android/index.uts
#	uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts
#	uni_modules/uts-nativepage/utssdk/app-android/DoAppWidget.uts
#	uni_modules/uts-nativepage/utssdk/app-android/index.uts
#	uni_modules/uts-screenshot-listener/utssdk/app-android/index.uts
#	uni_modules/uts-tencentgeolocation/utssdk/app-android/index.uts
#	uni_modules/uts-tests/utssdk/Number.uts