tree 28fc5c008f15224a303b7c7ce4bce92b0af191c7
parent 862bd82fb832039e0cff13a65737487a9aa12321
parent 0f9f0f90e719fc951cd217a9d69ca25b0685b83a
author Chris Craik <ccraik@google.com> 1492553912 +0000
committer android-build-merger <android-build-merger@google.com> 1492553912 +0000

Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev
am: 0f9f0f90e7

Change-Id: I9ed9b1d27c28aef19553721266cb531ac410c175