tree faee830bb6e288a34468d8a852be58b61cf8d2c7
parent c105f99b2f522bae8f3dc3a28ae45e7d82af67cd
parent 9c0b65779f7587b7c15f2504719b2d3ce933f231
author Brad Lassey <lassey@google.com> 1725377146 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725377146 +0000

Merge "Add a flag to enable watchdog for the NFC system process" into main am: db82667ec0 am: 9c0b65779f

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

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