Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

Browse Source

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

...

This commit is contained in:

Gagan290

2016-12-29 12:35:18 +05:30

parent 091900ac1e 0406008673

commit b39076fcf2

9 changed files with 463 additions and 0 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/drawable/sad_cloud.jpg

BIN

Binary file not shown.

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