build.gradle
4.71 KB
-
Merge branch 'new_master' into new_for_phone · 41669ad6
# Conflicts: # app/src/main/java/com/bgycc/smartcanteen/MainActivity.java
pye52 committed
# Conflicts: # app/src/main/java/com/bgycc/smartcanteen/MainActivity.java