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)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1484498

Change-Id: I28ef08b0fe9b3c94b02769f43e21f574e524da57


Trivial merge