Merge "resolve merge conflicts of 052975e
to master"
This commit is contained in:
committed by
Android (Google) Code Review
commit
1d2e0ba2f8
@@ -27,3 +27,4 @@
|
||||
android:paddingTop="@dimen/dashboard_padding_top"
|
||||
android:paddingBottom="@dimen/dashboard_padding_bottom"
|
||||
android:scrollbars="vertical"/>
|
||||
|
||||
|
Reference in New Issue
Block a user