Merge "resolve merge conflicts of 052975e to master"

This commit is contained in:
Salvador Martinez
2016-08-23 21:30:13 +00:00
committed by Android (Google) Code Review

View File

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