tree b8542c15784ecb74ca84b20ef2813fddd1643a6e
parent 880c601013e3b58f004f65c6cacfb8e19e2ca863
parent 08b004233537f625044b3f01e2923b600a9aa77c
author Justin Harrison <astyrrian@google.com> 1442623579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442623579 +0000

am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev

* commit '08b004233537f625044b3f01e2923b600a9aa77c':
  Add support for setting color transforms