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)
commitfc651ecf8195eb9ca0530b9aac4da0029396e987
tree61005a173c72a1ffec68f491fdb318fdad4cb8f1
parentb11fbf83645e96e8b18ef81605397f8201de84e2
parentbc1db397ebb25a8b1e14c35c217b0a0831f4557f
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev am: 049543b771
am: bc1db397eb

Change-Id: I76e107bbbb89e32f535324f393c8f4ad3341bed3