AdrianLxM 0b31062480 Remove diff meta info from unresolved merge conflict ... Should remove the "unsupported module" error in Android Studio		2017-01-24 01:24:05 +01:00
..
libs	wear add clockwise lib	2016-11-26 14:21:01 +01:00
src/main	wear PoweRGbg fixes	2016-11-28 18:42:19 +01:00
.gitignore	wear installing on watch	2016-11-24 16:23:31 +01:00
build.gradle	travis	2016-12-28 15:58:44 +01:00
proguard-rules.pro	wear installing on watch	2016-11-24 16:23:31 +01:00
wear.iml	Remove diff meta info from unresolved merge conflict	2017-01-24 01:24:05 +01:00