| commit | c8f8c6a7c7af4b7cde836ccf3d1ecd62402dfda8 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Tue Apr 18 22:30:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 22:30:04 2017 +0000 |
| tree | a2f5141b086368775e3cd876f56b3bcbf2d30918 | |
| parent | d1b8845decf67c1d6f796296567aa813b6b20407 [diff] | |
| parent | 0d6ea6a1f592bff5bdf88641aad67f748a4f6bda [diff] |
Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev am: 0f9f0f90e7 am: 0d6ea6a1f5 Change-Id: I84496c4aeee4cccc73f5d17f909d91f6910f1d85