tree c54d3be4f96b7ec74cb37b73b74bce7a78160734
parent 1fabd676e82482b42c2d441807d3365925e9aa5b
parent 1d605cfa9d50fdd0d226ce47aa448f7e8a30e7cc
author Ed James <edjames@google.com> 1468000266 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1468000266 +0000

Merge "gfch100: add cpu_temp to json and UI"