ashishandroid 83e6be733b Merge remote-tracking branch 'origin/GeoT' into GeoT ...

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

2017-01-06 11:42:14 +05:30

..

libs

Commit First New

2016-12-27 12:14:33 +05:30

src

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

2017-01-06 11:42:14 +05:30

.gitignore

Commit First New

2016-12-27 12:14:33 +05:30

build.gradle

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

2017-01-05 10:52:09 +05:30

proguard-rules.pro

Commit First New

2016-12-27 12:14:33 +05:30