• wanglei's avatar
    Merge remote-tracking branch 'origin/master' · 20e98ce5
    wanglei authored
    # Conflicts:
    #	MyDemo3/app/src/main/AndroidManifest.xml
    #	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/MediaAdapter.kt
    #	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/SimilarBeanAdapter.kt
    #	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/base/BaseActivity.kt
    #	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/util/MediaUtil.kt
    20e98ce5
Name
Last commit
Last update
..
.idea Loading commit data...
app Loading commit data...
gradle Loading commit data...
.gitignore Loading commit data...
build.gradle Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...