tree 2ac1d40d8dff612773947e5e832bbc30b6132627
parent 011ac1bb7c9c16468a337233ca7e801ca1a82557
parent 9324aa926a7fe74ed769525c3d93d4a55a378267
author TreeHugger Robot <treehugger-gerrit@google.com> 1501369684 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501369684 +0000

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