05aa369bae
# Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
fabric.properties | ||
proguard-rules.pro |
05aa369bae
# Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
fabric.properties | ||
proguard-rules.pro |