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

Commit 1b5d7640 authored by Jordan Jozwiak's avatar Jordan Jozwiak Committed by Automerger Merge Worker
Browse files

Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev... 

Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655c am: 6f603712 am: 7d48d460

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

Change-Id: Ia1df8a770ba78fcf903d3411d4a578069b6711d9
parents a4de5f07 7d48d460

There are no changes