tree 2c568adbb0d94ee4b67fbfc5c8e3357a9fe790a4
parent d8009938a3a8189fc28227d66894cf58df2bbfda
parent c9649eba5c3a898cd546296b60a644b04965eb53
author Tao Bao <tbao@google.com> 1539664055 -0700
committer android-build-merger <android-build-merger@google.com> 1539664055 -0700

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

Change-Id: Ie6bc5830efa045b061f95f8bf537e9a12304cc72