tree 288c864cfcfd405254702994875eaaac5a14363a
parent 417fa09eb7b0c38aec82fc062623d1977e4d7b0c
parent b162b20ed7783876eac54b3ab141e01584db5ebf
author Lloyd Pique <lpique@google.com> 1521277620 +0000
committer android-build-merger <android-build-merger@google.com> 1521277620 +0000

Merge "SF: Fix unit test getColorModes() expectation" into pi-dev am: 2349051fb6
am: b162b20ed7

Change-Id: I9c23f5392e629b729c9a0d4bfa89c0dc73f3b245