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

Skip to content
Commit bb38b85c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Caitlin Cassidy
Browse files

[conflict] Merge changes from topic... 

[conflict] Merge changes from topic "presubmit-am-1ab3ffc180ef400a970f85dbe14238c7-sc-dev" into sc-qpr1-dev am: 3994ced9

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

Change-Id: Ib4f4dd770ca40925beb8a4c7cce70bd49ecde4f4
Merged-In: I7707d01be37582461227edcecf5d559f2019c8a5
Fixes: 212467440
parents 34c8baf0 3994ced9
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