tree 2c568adbb0d94ee4b67fbfc5c8e3357a9fe790a4
parent e6b68dea3a6f529e1381a37f75724b15fe1048cf
parent 6abcee3efe20b59b89230d2b6faa723a7df9354d
author Tao Bao <tbao@google.com> 1539666473 -0700
committer android-build-merger <android-build-merger@google.com> 1539666473 -0700

Merge "uncrypt: fix ioctl direction for F2FS_IOC_GET_PIN_FILE" am: b5564f37be am: c9649eba5c
am: 6abcee3efe

Change-Id: Ia9190fbdc83e5ba2132b31b0ffb44da1ff804970