tree 5755a04c60d254e49de28df6adcac30d07cac3ff
parent c99f1806409c289fc6c58c78ee83a501d2ee1fd3
parent 3e36e13cfaef8c24b212675d3b3ed787522e8551
author Lucas Dupin <dupin@google.com> 1498590787 +0000
committer android-build-merger <android-build-merger@google.com> 1498590787 +0000

Merge "Scrim opacity" into oc-dr1-dev am: ce2ebd1285
am: 3e36e13cfa

Change-Id: I408238eff55b469ff0407c72c504e4e1adcc9b8b