tree d0be71c086f1df465bca5fb7064a1341a1f70e1e
parent aef55ec08bf0e8dc248d0bc9afa1478175d0c643
parent f65e92d9f96cabb23fd8afa43e0580ea616ea154
author TreeHugger Robot <treehugger-gerrit@google.com> 1498528764 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498528770 +0000

Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev