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 01:23:34 +0000 (18:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 4 Aug 2018 01:23:34 +0000 (18:23 -0700)
am: 5d07d87701

Change-Id: I74812879d97495154a28c2beeefaba279505730a


Trivial merge