tree f43674c1541eb290c7c31008b55b86cbe727152c
parent 67fb6f51fafb934f4c64973b95973de2f0d73d0a
parent 7805396ee657941a8bafc445bfa27aaf34ec01f7
author Benjamin Schwartz <bsschwar@google.com> 1608658798 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608658798 +0000

Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383 am: 7805396ee6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ef1ab620b8a56e62c295d081f714de208d9fa57