tree ec969849504e658b079758d9ec9f6d8484676e45
parent 888558b39083a0e36c378fd78d7c52eba48d92ed
parent 835f5e41de491c9df1278ed4f7643b0efbf2f46d
author Lucas Dupin <dupin@google.com> 1501370669 +0000
committer android-build-merger <android-build-merger@google.com> 1501370669 +0000

Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8
am: 835f5e41de

Change-Id: I8d62b640ac73f8a71931722a837726906ef2e49b