Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38851a86 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Automerger Merge Worker
Browse files

Merge "Don't call AlarmManager while holding the BatteryStatsImpl lock." into... 

Merge "Don't call AlarmManager while holding the BatteryStatsImpl lock." into udc-dev am: 5a2e66b0 am: adf1b5d0

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



Change-Id: Id88626d8239d3beeb55b71212473b5661999d489
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13568131 adf1b5d0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment