OSDN Git Service

Merge "Do not allow ScrimView backgrounds" into pi-dev am: b6238ed540
authorLucas Dupin <dupin@google.com>
Tue, 6 Mar 2018 20:58:09 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Mar 2018 20:58:09 +0000 (20:58 +0000)
am: 9e64f8260d

Change-Id: Ib50420d82eefa9d4354f29e3742d580743cc3a1a


Trivial merge