OSDN Git Service

Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev am: 049543b771
authorChris Craik <ccraik@google.com>
Tue, 27 Jun 2017 02:08:00 +0000 (02:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 02:08:00 +0000 (02:08 +0000)
am: bc1db397eb

Change-Id: I76e107bbbb89e32f535324f393c8f4ad3341bed3


Trivial merge