[automerger skipped] DO NOT MERGE am: ec43095960  -s ours am: ba907922fc  -s ours
am: 8d93343bfc  -s ours

Change-Id: I623abf022b45a7edeb726fc33ed48fb28a8a8e32
tree: 787eaae95d55a768a7b7deb0d61d1481ad4f877e
  1. Android.mk
  2. thermal-845.c
  3. thermal-8998.c
  4. thermal-default.c
  5. thermal.c