OSDN Git Service

Merge "Make ImportWrappedKey work with real hardware: Get unwrapping params from...
authorFrank Salim <franksalim@google.com>
Fri, 18 May 2018 23:04:15 +0000 (16:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 23:04:15 +0000 (16:04 -0700)
commitcaad2c83d33d0e7c9e2af8654de82e28d9631912
tree376ae180f273ae47949fb9439f1306d7b70d04f3
parent0bbb9c16666cb726d309a59165bd48ef743ec85c
parenta7eba8d41257fee8467150fdced9a9a89805c151
Merge "Make ImportWrappedKey work with real hardware:   Get unwrapping params from WrappedKeyEntry" into pi-dev
am: a7eba8d412

Change-Id: I1bc3e0d42506882eebad6d59d0a9f0d53104f9f3