Merge "Emergency Function HAL (continued)"
authorShuo Qian <shuoq@google.com>
Wed, 3 Oct 2018 02:21:20 +0000 (19:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Oct 2018 02:21:20 +0000 (19:21 -0700)
am: f461463b39

Change-Id: I6c0105193a38b477fdfa7e8b88343bd5b8bb2f14


Trivial merge