tree ea02b60dc25a68ffaddc5f34bfd20c98fc4c0505
parent 7d37f592ac632ba415d3953eef0e8621c456b73c
parent 343ce09289c49e923dbffa1139d85a03ab360668
author Jaegeuk Kim <jaegeuk@google.com> 1539315774 -0700
committer android-build-merger <android-build-merger@google.com> 1539315774 -0700

[automerger skipped] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: e42a494592  -s ours
am: 343ce09289  -s ours

Change-Id: I3f4d0300f3c63c392cff66dbda16e4ae7467f8cb