Merge remote-tracking branch 'origin/qrcode_20200724' into qrcode_20200724

Browse Source

# Conflicts:
#	app/src/main/java/com/ydd/sportfaceid/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/layout/activity_sdsetting.xml

...

This commit is contained in:

wangyb

2020-07-29 17:37:10 +08:00

parent e898691c5c cfce0624ca

commit d456beb31a

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

app/src/main/res/mipmap-hdpi/venue_sport.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 48 KiB