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

Skip to content
Commit 60b836b0 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "[automerger skipped] default hidl CryptoPlugin: security fixes... 

Merge "[automerger skipped] default hidl CryptoPlugin: security fixes [RESTRICT AUTOMERGE] am: d22f1447 am: 756f134f am: f6e7c9ed -s ours am: fe72b76d -s ours am: 5cfbc4ba am: 7063ed4b am: 3a65eb77" into qt-qpr1-dev-plus-aosp
am: 562e4f15 -s ours
am skip reason: subject contains skip directive

Change-Id: I69020a812baac1b89309ce2c9cfe5734be9cb22e
parents 7f4dfda4 562e4f15
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