tree 4f508560f20f9e85b8a15d573a6f0fd1104c2106
parent 39cf394fe4bb004c6f7d01669f65aad28a862660
parent e364e4aa308e591089d140a4636b2bb9a677e63b
author Yifan Hong <elsk@google.com> 1543443809 -0800
committer android-build-merger <android-build-merger@google.com> 1543443809 -0800

Merge "Add health HAL to watchdog" am: 80da7610e1
am: e364e4aa30

Change-Id: Icbcb387c2e428142ab15e2f66771324f5fe03362