tree 7862ae5c4eddc7ce492bfd1afd663e56ea5b7eb8
parent e244efd69f24846592d39855fa44efbb3bc0a56a
parent f98facc3b82ea45209831aa7ecdb6155b6744b57
author Lucas Dupin <dupin@google.com> 1501370269 +0000
committer android-build-merger <android-build-merger@google.com> 1501370269 +0000

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

Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06