tree c9700da61b14334ddfba024a11bd8780eaf03273
parent 97e692fab308ed52a5e4f019de0027afe004316e
parent 510daac2ccd09ba3fbe95f712948a95f4946b80d
author Tao Bao <tbao@google.com> 1555437528 -0700
committer android-build-merger <android-build-merger@google.com> 1555437528 -0700

Merge "Remove the FD parameter from FuseDataProvider ctor." am: bb0c6e1fe7
am: 510daac2cc

Change-Id: I4bc8b5a42804ec83a29a339f82b8ce4ce3b59709