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

Skip to content
Commit cd75394e authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

[automerger skipped] resolve merge conflicts of... 

[automerger skipped] resolve merge conflicts of f7b975c5 to qt-qpr1-dev-plus-aosp
am: 31706c85 -s ours
am skip reason: change_id I4a697c1eaccc3603007be4a595febea981fbeb64 with SHA1 33e8ef86 is in history

Change-Id: I9a36145505261f8bca044b5cf36146f5d88600af
parents f6581aaa 31706c85
Hide 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