tree 10ab057ebcc0217a8aecbf9e77a58f574f5adfe6
parent 47cdd3d8e96b09a3bd8516ffba338105d12598c1
parent 8bf30a7826c08ad04a3bff64500aeb56101f6918
author Daichi Hirono <hirono@google.com> 1492175461 +0000
committer android-build-merger <android-build-merger@google.com> 1492175461 +0000

Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev am: 73b54bfd6d
am: 8bf30a7826

Change-Id: I48091d9868233f0ef329d0c2db4ffac5bba04eac