tree ed5f5159fc2aa8d565a9ad879a9782025c70fe42
parent f5694171be57de0361849f2589ad54f2efe51276
parent 2d4e16150558f3ef4999346d809128046267ef9c
author Casey Dahlin <sadmac@google.com> 1447883322 +0000
committer android-build-merger <android-build-merger@google.com> 1447883322 +0000

Merge "Revert "Add support for unique_fds and vectors of file descriptors"" am: 5cd09786eb
am: fb92cfcd3e

* commit 'fb92cfcd3e8977a6cac0147de80bf2a0fb6a2d87':
  Revert "Add support for unique_fds and vectors of file descriptors"