tree 97f6cf28e280832680ba2095d95c7ceab3a87f97
parent 22f226245a1c399be7d2890d50fd56aadf49ebbe
parent d5de2f22b70cbc97b40bb350f362518b58d3a1bf
author Eric Biggers <ebiggers@google.com> 1604970673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604970673 +0000

Merge "KeyStorage: rework key upgrade handling" am: d5de2f22b7

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1483694

Change-Id: Ib6c052565b3fe79eeb928daa564a7431f89aed22