tree 3cd2cb55676c12dd66b9486b4cfaa326576438c9
parent 1b48ca589b967725339c16eaeabce33cb8213b99
parent 74df3ec00247ea18ccf43c466e26dfe1a4622162
author Noah Wang <nfw@google.com> 1459374530 +0000
committer android-build-merger <android-build-merger@google.com> 1459374530 +0000

Merge "Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
am: 74df3ec

* commit '74df3ec00247ea18ccf43c466e26dfe1a4622162':
  Make preview screens in font/display size settings scrollable Bug: 27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82

Change-Id: Ieb2a3374987ae69f8305aa0b03a94f907d4a4061