OSDN Git Service

Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0 am: 5a9feb48fa
authorEric Biggers <ebiggers@google.com>
Tue, 3 Nov 2020 18:04:23 +0000 (18:04 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 3 Nov 2020 18:04:23 +0000 (18:04 +0000)
commit61ffc1b096ed49a1755bafb857af236fabd0e822
tree9e23a551d4726dbfba5d8a78fd82a0639715280b
parent83ff4db88a5c2b603d3a27ee84629da1c7e3aec1
parent5a9feb48fab12ef9753cace44793a0b42c788b93
Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0 am: 5a9feb48fa

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

Change-Id: Ia206b84e8b2ec96882da9c51102f955161ca06f3