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

Commit e01a0ff5 authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into... 

Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into udc-dev am: 0dda4e11 am: 8ea74828

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214159



Change-Id: I956f13b1fb65a998cb866d37cb051ae9cc1d1b91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b72a2abd 8ea74828
Show 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