tree c0ede14037f6cecca980135d43c1ae52464e7b8f
parent 3df7c898e0b8668133c665fa88331351d3c40d92
parent df65b87c7ee47803f7d2a09cc8b8962c3db58fd9
author Treehugger Robot <treehugger-gerrit@google.com> 1608382441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608382441 +0000

Merge "KeyMint: Use unstable-ndk_platform" am: 92fdb33e27 am: df65b87c7e

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1532844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7897543d5cc153947b0ce0cc01bd90b25c4e493