Skip to content
Commit f5c63771 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Automerger Merge Worker
Browse files

Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb am: 32ae8903 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I870f28416bdf80a7ee2b725b9ab31a0b503ce181
parents 9858b561 32ae8903
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment