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

Skip to content
Commit 3ec5783f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Fix race condition between lockNow() and... 

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d2 am: 548ddc79 -s ours am: 648b6b5d -s ours

am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512 is already in history

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

Change-Id: I6811a045f3c856c27e305b0a8f9c0c5f43a1e7e6
parents 92a042d6 648b6b5d
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