flutter_barcode_reader/example/android/app
weilu d36a12a9c6 Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
#	android/build.gradle
#	android/src/main/kotlin/com/apptreesoftware/barcodescan/BarcodeScanPlugin.kt
#	example/.gitignore
#	example/android/app/src/main/AndroidManifest.xml
#	example/android/gradle.properties
#	pubspec.yaml
2020-04-10 13:43:52 +08:00
..
src/main Merge remote-tracking branch 'upstream/master' into dev 2020-04-10 13:43:52 +08:00
build.gradle Merge remote-tracking branch 'upstream/master' into dev 2020-04-10 13:43:52 +08:00