Merge branch 'branche_zsf' of http://39.97.65.143:81/android/android_street into branche_zsf
Conflicts: shareSdkLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml shareSdkLib/build/intermediates/incremental/mergeDebugShaders/merger.xml shareSdkLib/build/intermediates/incremental/packageDebugAssets/merger.xml shareSdkLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties shareSdkLib/build/intermediates/incremental/packageDebugResources/merger.xml shareSdkLib/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt shareSdkLib/build/outputs/logs/manifest-merger-debug-report.txt
Showing
File moved
Please register or sign in to comment