tree c136a192d1e7f8b94057427807fc4e802ef1dc91
parent 017f4870a13967e36c4ddd039b1fe8c2e353d596
parent 3509d1f79036c0155ab5f41acbfc14e5fd3eb0a6
author Romain Guy <romainguy@google.com> 1491929485 +0000
committer android-build-merger <android-build-merger@google.com> 1491929485 +0000

Merge "Hide ColorSpace.Renderer" into oc-dev am: 5094caafc2
am: 3509d1f790

Change-Id: Ic7bb2ee6326a9152bbd3bb015025d8f39d7a2527