OSDN Git Service

[automerger skipped] KeyUtil: don't use keepOld=true for system DE and volume keys...
authorEric Biggers <ebiggers@google.com>
Thu, 5 Nov 2020 17:50:20 +0000 (17:50 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 5 Nov 2020 17:50:20 +0000 (17:50 +0000)
am skip reason: Change-Id I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29 with SHA-1 c493903732 is in history

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

Change-Id: Ieb69946c8c2a6640b7af58561d872b50022d4f5b


Trivial merge