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

# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 10:07:07 +05:30
parent 1c48f2f8ad
commit af4271360a
11 changed files with 225 additions and 10 deletions
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <item
        android:id="@+id/action_planogram"
-        android:icon="@mipmap/star"
+        android:icon="@mipmap/ref_images_white"
        android:orderInCategory="100"
        android:title="planogram"
        app:showAsAction="always" />