Commit Graph

1 Commits

Author SHA1 Message Date
ashishandroid fb8a08a5cb 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-05 10:52:09 +05:30