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-12 17:04:24 +05:30
parent 11455f7702
commit 1c48f2f8ad
12 changed files with 559 additions and 416 deletions
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_planogram"
+        android:icon="@mipmap/star"
+        android:orderInCategory="100"
+        android:title="planogram"
+        app:showAsAction="always" />
+</menu>