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 00:22:31 +0000 (00:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 00:22:31 +0000 (00:22 +0000)
am: b0722aeb88

Change-Id: Iee75b36e9c6a07bbadfebd8e561edc352492520a


Trivial merge