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

Skip to content
Commit 82364717 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

[automerger skipped] resolve merge conflicts of... 

[automerger skipped] resolve merge conflicts of 8786016e to rvc-qpr-dev am: a538ffe2 am: 5dd7e72e -s ours

am skip reason: skip tag Change-Id I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 8786016e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694

Change-Id: I9f745ba547b331b4953ea060127b463a5acc28f0
parents 781b8414 5dd7e72e
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