b40690d0c2
Resolved Conflicts in: [...]/watchfaces/Home.java [...]/watchfaces/Home2.java [...]/watchfaces/LargeHome.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
proguard-rules.pro |
b40690d0c2
Resolved Conflicts in: [...]/watchfaces/Home.java [...]/watchfaces/Home2.java [...]/watchfaces/LargeHome.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
proguard-rules.pro |