tree 13d10e6f5d0f9029b7aa543b8adcf9d1df682d92
parent fcf9c0d1337f13abe6e4b4676504a7d3d3b057db
parent 2ff5fe8d08d0f37c4fd457e21618a79b74329ef3
author Android Build Merger (Role) <android-build-merger@google.com> 1501855372 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501855372 +0000

Merge "Merge "Revert opacity changes from (Id94a5684b2c55956b01aa6cfb240784e6bab2f6e)" into oc-dr1-dev am: d17d52567b am: f1ac893291" into oc-mr1-dev-plus-aosp