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

Commit f23332b9 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: 8662b9cc am: 2bf4ee93 am: b82940c1

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



Change-Id: I20229b910e16eb05f689953552c79af6aacc108a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d2912d2 b82940c1
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