Merge branch 'master' into JioAC

2017-01-18 17:33:03 +05:30
parent e7ca0ef7a5 e28cb3cdbd
commit 7d546d79db
36 changed files with 1018 additions and 204 deletions
@@ -152,6 +152,10 @@
        <activity
            android:name=".dailyentry.CheckoutActivity"
            android:label="@string/title_activity_checkout"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".dailyentry.ServiceActivity"
+            android:label="@string/title_activity_service"
            android:theme="@style/AppTheme.NoActionBar"></activity>
    </application>