am 2542e45d: am 00f6b1b6: am 345b5188: Merge "Allow thermal_engine to /dev/msm_thermal_query"

* commit '2542e45d8d7b6655e27f901e0effccec810c2a31':
  Allow thermal_engine to /dev/msm_thermal_query