tree 4150f094f583c43ae848813ead29023cd21a2416
parent 453ed7ddae6fda8ebb5931011f821ce1982a6a4b
parent 4a90942ea75039f916d8371111fdc41a80039b98
author Dan Stoza <stoza@google.com> 1441333301 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441333301 +0000

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

* commit '4a90942ea75039f916d8371111fdc41a80039b98':
  SurfaceControl: Add colorTransform to DisplayInfo