OSDN Git Service

Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
authorFan Zhang <zhfan@google.com>
Mon, 10 Jul 2017 21:31:39 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 21:31:39 +0000 (21:31 +0000)
am: 5d3f6d566b

Change-Id: Ifd5f8aae85864e2a264ea76e28700cf82a0bfac5


Trivial merge