tree cd16f63e49e7e644433abd1c5ffd1c3a780bee73
parent bcb80b03f196ea5709a102c2ed7769de5d263945
parent 46db0f2215ad6e969418d1fedd1578445b46588f
author Justin Harrison <astyrrian@google.com> 1442686495 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442686495 +0000

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

* commit '46db0f2215ad6e969418d1fedd1578445b46588f':
  Add support for setting color transforms