tree 322ddf61641e931df792d31779772c424869cf85
parent 52b03b8cebcfd40c0ee5688a50dafd9a75d12e5f
parent 1c32d2cd9842e15e480edfa4b52edd4d507db0f8
author Romain Guy <romainguy@google.com> 1492558961 +0000
committer android-build-merger <android-build-merger@google.com> 1492558961 +0000

Merge "Change nullability of colorspace parameter" into oc-dev am: 944782fac2
am: 1c32d2cd98

Change-Id: I92853da836ce26801b9350cb1f65664e58e15d47