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

Commit 274349de authored by Your Name's avatar Your Name Committed by Automerger Merge Worker
Browse files

[automerger skipped] Adding a timeout for active-unlock am: 57e69442 -s ours 

am skip reason: Merged-In Ia0ccf7ecc9dacf9f4a7a913c7fce8532e6a1ece1 with SHA-1 2410cfc0 is already in history

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

Change-Id: Ibadde6ffd066695b5a0f340d229d6cee2209f863
parents 2c8001d2 57e69442
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