OSDN Git Service

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

Change-Id: I10712da29d0c84d2aa462bf892857e27c73f273b