tree ecee3208585b102649c762042351e4d326e7770f
parent 2f142ab0779c9e36c6f733d7e2e0be083f7172ac
parent 0b887e579b766012c09626e7089a3fade5415ee6
author Dan Stoza <stoza@google.com> 1441317788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317788 +0000

am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev

* commit '0b887e579b766012c09626e7089a3fade5415ee6':
  SurfaceControl: Add colorTransform to DisplayInfo