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

Skip to content
Commit b02ac126 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[automerger skipped] Merge "Move conscrypt from the set of... 

Merge "[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs" am: d28224cf am: b09d7cfb -s ours am: f3eb744d -s ours am: 9750d877 -s ours" into rvc-qpr-dev-plus-aosp am: ba8ff6f5 -s ours

am skip reason: Change-Id Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f with SHA-1 e89d37d6 is in history

Change-Id: I157d36641740981e0c3851fb7fdf860fa2e54b7c
parents 5d3555b9 ba8ff6f5
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