PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 052975e to master

Browse Source 
Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd
This commit is contained in:
Salvador Martinez
2016-08-23 13:59:48 -07:00
parent 803e69f62b 052975ed22
commit 22d1849e6a
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/dashboard.xml
View File

@@ -27,3 +27,4 @@
android:paddingTop="@dimen/dashboard_padding_top" android:paddingTop="@dimen/dashboard_padding_top"
android:paddingBottom="@dimen/dashboard_padding_bottom" android:paddingBottom="@dimen/dashboard_padding_bottom"
android:scrollbars="vertical"/> android:scrollbars="vertical"/>