resolve merge conflicts of 052975e
to master
Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd
This commit is contained in:
@@ -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