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

Skip to content
Commit b82b5421 authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[conflict] Merge changes Ie810d37d,I6947e1f7 into tm-qpr-dev am: 33b10071 am: 9e708c99 

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



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