tree c041e682fe59ac0ed27b31bb7daae22dc51eee83
parent ae8c2ca3ea307b2d72ee37b0a8db2001b2d8feba
parent 159d267cc6ed9b5d6d561479b4579981aced6b64
author Yifan Hong <elsk@google.com> 1546910260 -0800
committer android-build-merger <android-build-merger@google.com> 1546910260 -0800

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

Change-Id: I7dd0df6adbe7315326064e5b660432dc60be6495