OSDN Git Service

Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am: 4a969dba60...
authorEric Biggers <ebiggers@google.com>
Tue, 3 Nov 2020 00:23:55 +0000 (00:23 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 3 Nov 2020 00:23:55 +0000 (00:23 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1480696

Change-Id: Idec4eb2c0afca69c0b322935397bea009f5683f1


Trivial merge