Merge "Emergency Function HAL (continued)" android-o-mr1-iot-release-1.0.5
authorShuo Qian <shuoq@google.com>
Wed, 3 Oct 2018 01:36:17 +0000 (01:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Oct 2018 01:36:17 +0000 (01:36 +0000)

Trivial merge