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

Commit 42d26d9c authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "[flexiglass] Lock screen -> Lockscreen." into udc-dev am: 32becff0... 

Merge "[flexiglass] Lock screen -> Lockscreen." into udc-dev am: 32becff0 am: e53e343c am: 4ed5055d am: 2689dcca

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



Change-Id: I4c10968fca4e32412bd959c38aa13c2a1198dd8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efaff9ac 2689dcca
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