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

# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2017-01-04 12:49:55 +05:30
parent 422da8a54c
commit 18bd289c1d
8 changed files with 570 additions and 73 deletions
@@ -19,7 +19,6 @@
        android:layout_height="match_parent"
        android:layout_gravity="start"
        android:fitsSystemWindows="true"
-
        app:menu="@menu/activity_main_drawer" />

 </android.support.v4.widget.DrawerLayout>
@@ -5,6 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
+    android:id="@+id/coordinate"
    tools:context="cpm.com.gskmtorange.MainActivity">

    <android.support.design.widget.AppBarLayout