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

Skip to content
Commit 9750d877 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs"... 

[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs" am: d28224cf am: b09d7cfb -s ours am: f3eb744d -s ours

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

Change-Id: I62d99345d7f98e80c244ad902a140839703600ae
parents 557edefd f3eb744d
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