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

2017-01-05 16:02:09 +05:30

parent 25008a1aef

commit ade4954f45

11 changed files with 132 additions and 120 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/PDR.png

BIN

Binary file not shown.

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