tree 97f6cf28e280832680ba2095d95c7ceab3a87f97
parent 420868767fce0b464e06602ba018cb412d39ae6a
parent 689b4e7110d0c53c3b461042d303807f5ac590af
author Eric Biggers <ebiggers@google.com> 1604971531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604971531 +0000

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

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

Change-Id: I67dc8c73d5362b1bf5600fe612148f0ccc918179