tree b89f8a12070e81c3e541ce7e21336c4497fbe0d7
parent d6f1a98f4be03bec4262a6bbc0e8c594f51cc076
parent 83ff4db88a5c2b603d3a27ee84629da1c7e3aec1
author Eric Biggers <ebiggers@google.com> 1604364226 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604364226 +0000

Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am: 4a969dba60 am: 1d692f3b7b am: 83ff4db88a

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

Change-Id: I23bd8f557ddd143a9e1efa1d9e79a8181f9a5901