From: Xin Li <delphij@google.com>
Date: Thu, 7 Dec 2017 22:05:05 +0000 (+0000)
Subject: DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4  -s ours am: 00a2c10b44
X-Git-Tag: android-x86-9.0-r1~62^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=43dd997761cac8450007915741684c7fff7accf0;p=android-x86%2Fsystem-vold.git

DO NOT MERGE: Merge Oreo MR1 into master am: 1843c887d4  -s ours am: 00a2c10b44
am: 81daada217  -s ours

Change-Id: I157feb353c48566849a001630ed505dc5911addd
---

43dd997761cac8450007915741684c7fff7accf0