tree 7fa2df9a6a22f0aa7778ee7a13f263fe8753f9e6
parent 8ddb283a68f27b5fe47c2a3074e62ec8aba8934a
parent 253c91192fdda00f2c34c029e100b06b9fc4f4d6
author John Wu <topjohnwu@google.com> 1642554811 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642554811 +0000

Merge "Update AndroidKeyStoreMaintenance framework API" am: 8c34efd29a am: be201a0ed5 am: 7d7010dcf8 am: 253c91192f

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

Change-Id: I8b3f892d829decc104ef2a732af5fbbfa3e08fa8