Merge branch 'master' into CodeFire22

2017-02-15 10:44:27 +05:30
parent 6799680555 2fe59a1f27
commit 64fb3f63f8
23 changed files with 2190 additions and 68 deletions
@@ -171,9 +171,17 @@
            android:label="@string/title_activity_upload"
            android:screenOrientation="portrait" />
        <activity
+
            android:name=".dailyentry.T2pBrand_Avaibility"
            android:label="@string/title_activity_t2p_brand__avaibility"
            android:theme="@style/AppTheme.NoActionBar"></activity>
+ <activity
+            android:name=".gsk_dailyentry.StockFacing_PlanogramTrackerActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:label="@string/title_activity_stock_facing__planogram_tracker"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar" />
+
    </application>

 </manifest>