yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qa_1.1.5_1' into qa_1.1.5_2

Browse Source 
# Conflicts:
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
This commit is contained in:
tongchenfei
2020-09-11 11:37:57 +08:00
parent e97369a692 29b9a10f32
commit b199b39752
95 changed files with 9751 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/crashreport-bugly/build/intermediates/incremental/packageDebugAssets/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\assets"/></dataSet></merger>