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 18:30:24 +0000 (18:30 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 5 Nov 2020 18:30:24 +0000 (18:30 +0000)
commit43d312b312aa6a94847781c04edda0b5f681449b
treea5ca7f01479988fa1827ead8fab2396b9c7a1b62
parentb33443f3648293c2875d98727def5c09ca12639a
parente4bf57a6d3ac3fd5e2f0c4861a036298d902ede1
[automerger skipped] KeyUtil: don't use keepOld=true for system DE and volume keys am: 2c9d6d6675 -s ours am: e4bf57a6d3 -s ours

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: Id0992059969480e9e15d14c77fc04f1d55c9cfc8