tree 6de4abf2af90005502ff77249819c878dbe02e1e
parent 0bccbf5b79f5c9734ca0c309895ba078384020a9
parent f5c637719f71125b0d0fb29d397a9137e535bccc
author Benjamin Schwartz <bsschwar@google.com> 1609959748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609959748 +0000

Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d am: 32ae89039f am: f5c637719f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc06889dd782b73044512e90c02cb130697a01c