Merge branch 'master' into GeoT

2016-12-30 14:56:33 +05:30
parent 7f24e8550f 5163c780bc
commit 0d750227f7
43 changed files with 3067 additions and 218 deletions
@@ -37,4 +37,9 @@
    <string name="menu_setting">Setting</string>
    <string name="menu_services">Services</string>

+    <string name="title_activity_category_list">Category List</string>
+    <string name="title_activity_category_wise_performance">CategoryWise Performance</string>
+    <string name="title_activity_daily_main_menu">DailyMainMenuActivity</string>
+    <string name="title_activity_msl__availability">MSL_AvailabilityActivity</string>
+
 </resources>