tree 99bb6b03559766f51e5cae187d34a31fc624fe94
parent d7c1801f8d968aa387e1abaa8628be436a1a00e5
parent d2e801fb93a870b97c24cccacab72eef6bd2f87e
author Yifan Hong <elsk@google.com> 1546910932 -0800
committer android-build-merger <android-build-merger@google.com> 1546910932 -0800

Merge "updater: erase ignores EOPNOTSUPP for BLKDISCARD" am: 08a8b40c91 am: 159d267cc6
am: d2e801fb93

Change-Id: I8626208127ccdb245823a5db40e9fe6583c63ea0