OSDN Git Service

Merge "Do not allow ScrimView backgrounds" into pi-dev
authorLucas Dupin <dupin@google.com>
Tue, 6 Mar 2018 20:02:37 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Mar 2018 20:02:37 +0000 (20:02 +0000)
commit9e64f8260dc6d6bc9111ffe975c8a27ef9440b5e
treefccfc00891ef2fc592d6b1ca9c79cdbdafd13d90
parentd2832e320b90eb668e5326cab5ab68b6aad70ece
parentb6238ed540ab474b6d9f347d227b1f3103966ccd
Merge "Do not allow ScrimView backgrounds" into pi-dev
am: b6238ed540

Change-Id: If02fcf7c2347f31d36067ac06672cfa361653fa7