tree 7ae60927b1e4486371b09a96088a9e6bcb957f30
parent 570451fb1177028e860c84e8bf30f7b84493e7bd
parent 3fe70f547e644ea1e927e9401fb436fa0e02553d
author Nick Kralevich <nnk@google.com> 1402506359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402506359 +0000

am 3fe70f54: Merge "Allow thermald dac_override."

* commit '3fe70f547e644ea1e927e9401fb436fa0e02553d':
  Allow thermald dac_override.