tree c2f13a40ed3cbb5773fab6ab6b85a762d8de4562
parent e4f83a107b368ddeae1c532051ccc9c226da6cee
parent 40b8fc37d42de6b49031783629b2bec908d3ebe8
author Steven Moreland <smoreland@google.com> 1611967946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611967946 +0000

Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406 am: ac37ade768 am: 40b8fc37d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564415

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ce40879a3dd677cd2a873d1b8bdf0c9392cd610