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

Browse Source

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml

...

This commit is contained in:

Gagan290

2017-01-12 17:04:24 +05:30

parent 11455f7702

commit 1c48f2f8ad

12 changed files with 559 additions and 416 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-hdpi/cancel.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 995 B