tree 8646b8e896dc31d3698d31b0a2e386d9f03dc606
parent 0ba5125d58eac0608fac767435586f1d6945e523
parent 2975d5a0075cf99b68cbfaee85c3af22b826cbde
author Steven Moreland <smoreland@google.com> 1701975996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701975996 +0000

Merge "ANR WatchDog += servicemanager" into main am: 657bc29a5d am: 2975d5a007

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

Change-Id: Ibf8b963e742c764fd34406e14dfc2b95261e6ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>