OSDN Git Service

Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
authorMatthew Fritze <mfritze@google.com>
Fri, 30 Sep 2016 17:02:41 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 17:02:41 +0000 (17:02 +0000)
am: 3d4df23a17

Change-Id: I370874b94565d066762f2b1b8a4a46a5c4d92295


Trivial merge