tree 579eba0e786bfd811679ba25c312e979ef7d3474
parent ce917a8f14e4e022b9cda721703e642a9cdd4817
parent 62bdf8c076109b4d5ce2863f9e0a28b161425e35
author Treehugger Robot <treehugger-gerrit@google.com> 1611763878 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611763878 +0000

Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50a67a9f9244e5d5f16b186a8f993baf8303c236