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

Browse Source

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

...

This commit is contained in:

ashishandroid

2017-01-09 18:13:27 +05:30

parent 83e6be733b

commit a95bf5cddd

19 changed files with 2195 additions and 130 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

GSKMTOrange/src/main/res/mipmap-mdpi/new_camera.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.4 KiB