tree a5fe7ccd29b4f11a4e453b43d4f1224a091462c0
parent 8c840202748b969f418c36a28c30b685ccd1f167
parent 91db71d2a0c3c8ac4f13b06738fe87edc2db45ad
author Todd Poynor <toddpoynor@google.com> 1489544940 +0000
committer android-build-merger <android-build-merger@google.com> 1489544940 +0000

Merge "libcutils: android_reboot: add thermal shutdown command" am: 97a2c49a58 am: 938f80838c
am: 91db71d2a0

Change-Id: I40941643b63050b11fc8e904890de38faa38ba98