tree d19164ce1824153cff29947f44f2001514881e1d
parent 95177aab00fb845f1fc91b621ca1319bcadef3cf
parent 58383d92c6cfad78f6c0ed324be36ba996b0b2f3
author Daeho Jeong <daehojeong@google.com> 1600130722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600130722 +0000

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1420895

Change-Id: I51b4ca860a8222a2a978ea96cbd68d53262ac2e3