commit | 08ff413e7e5615f064bf4769e02494ee5bf63471 | [log] [tgz] |
---|---|---|
author | Todd Poynor <toddpoynor@google.com> | Tue Aug 08 02:36:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 02:36:24 2017 +0000 |
tree | 1bfa4ca8c90edec4adf824cf0b389d680ce8fc7b | |
parent | e7915f5be6dd849ad71351e138cbb1d1b07fafdf [diff] | |
parent | 948f9b59e9fbf82d48bb052d292e3c1f5e2b81b8 [diff] |
Merge changes from topic 'thermal-notify-mr1' into oc-mr1-dev am: 176f07a74d am: 948f9b59e9 Change-Id: I9388b381eca411dcc702c3749834e869f8859c2e