OSDN Git Service

Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8...
authorJaegeuk Kim <jaegeuk@google.com>
Sat, 4 Aug 2018 00:21:37 +0000 (17:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 4 Aug 2018 00:21:37 +0000 (17:21 -0700)
am: 2db64225ca

Change-Id: I01b1903a5d47188432f1eec5d522ead77db18675


Trivial merge