tree abe4f83836fb531e756beb085332ddf68cca3228
parent cc0df592427438f7ddb336872f181bb03935e1b6
parent 5d07d8770116c18de73d0c150fb0bc249dd2d665
author Jaegeuk Kim <jaegeuk@google.com> 1533345814 -0700
committer android-build-merger <android-build-merger@google.com> 1533345814 -0700

Merge "secdiscard: should pin_file to avoid moving blocks in F2FS" am: cb114c36d8 am: b7b419541b am: 2db64225ca
am: 5d07d87701

Change-Id: I74812879d97495154a28c2beeefaba279505730a