commit | 0d6ea6a1f592bff5bdf88641aad67f748a4f6bda | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Tue Apr 18 22:18:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 22:18:32 2017 +0000 |
tree | 28fc5c008f15224a303b7c7ce4bce92b0af191c7 | |
parent | 862bd82fb832039e0cff13a65737487a9aa12321 [diff] | |
parent | 0f9f0f90e719fc951cd217a9d69ca25b0685b83a [diff] |
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev am: 0f9f0f90e7 Change-Id: I9ed9b1d27c28aef19553721266cb531ac410c175