OSDN Git Service

Merge changes Idc575106,Id6457a2b am: 3e0e53dbe5 am: 8671044a64
authorEric Biggers <ebiggers@google.com>
Mon, 19 Oct 2020 17:30:11 +0000 (17:30 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mon, 19 Oct 2020 17:30:11 +0000 (17:30 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1462712

Change-Id: I9c673f9b4bf31b88c8ffa74e6f32f8eb4d2f9045


Trivial merge