# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/MainActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/ShowBleActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/config/BleDeviceConfig.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/airdetector_test/AirDetectorActivityTest.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/broadcast_height/BroadcastHeightActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe/MeatProbeActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/meat_probe_charger/MeatProbeChargerActivity.java
#	app/src/main/java/aicare/net/cn/sdk/ailinksdkdemoandroid/modules/weight_scale/WeightScaleActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/colors.xml