tree 548bb7dd9d1075437f404b1debfd5bf8112e686f
parent f9eb4e87168cdf58766034a2b0020c274e457a12
parent 7700c2b238a2acd3ae1fe27ae7b5dc156cd2da2d
author Romain Guy <romainguy@google.com> 1492203427 +0000
committer android-build-merger <android-build-merger@google.com> 1492203427 +0000

Merge "Fix API feedback on Color" into oc-dev am: 03758701fb
am: 7700c2b238

Change-Id: I64f6dcabfd1722475947be3b3e3cc636b724dbed