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

Commit 32e0ce1e authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Ale Nijamkin
Browse files

[conflict] Merge changes I91b545e9,Iac6ce358 into udc-qpr-dev am: 776e8d05 am: 41a4e097 

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



Bug: 295214574
Change-Id: I2e51d44aa3163ca6d6ea1d4a8534f114d9884286
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 539ed414 41a4e097
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