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-06 18:10:32 +05:30
parent e1edc5c8bc
commit 161804e602
2 changed files with 99 additions and 7 deletions
@@ -14,9 +14,9 @@
        android:id="@+id/scrollView_promoCompliance"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true">
+        android:layout_alignParentStart="true">

        <LinearLayout
            android:layout_width="match_parent"