OSDN Git Service

Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0
authorEric Biggers <ebiggers@google.com>
Tue, 3 Nov 2020 17:48:09 +0000 (17:48 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 3 Nov 2020 17:48:09 +0000 (17:48 +0000)
commit5a9feb48fab12ef9753cace44793a0b42c788b93
tree9e23a551d4726dbfba5d8a78fd82a0639715280b
parent1d692f3b7bc804144cafa03526993052ba64b5c4
parent27f3ab89d0c98a8f23788a54a7c6d040d46c6db4
Merge changes I8d2bd67d,I704522b2 am: 27f3ab89d0

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

Change-Id: I28ef08b0fe9b3c94b02769f43e21f574e524da57