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

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

Merge "Merge "WrappedApplicationKey: Remove superfluous branch in... 

Merge "Merge "WrappedApplicationKey: Remove superfluous branch in deserialization." am: 2e6b40a8 am: 2efefc72 am: f464e50d" into tm-dev am: a4b25400

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



Change-Id: Ia80bb78f9bfbf107c809f1923a09b4b6d4d8ec5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbe6b9c2 a4b25400
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