tree 9ac0815b1b2169e83390ae6bc9b0717354231489
parent c788a0936b54de215ec33258f8829e4359b34aee
parent 7fde0438a4f0fb12f978616628ab99696d14bbc0
author Casey Dahlin <sadmac@google.com> 1448318247 +0000
committer android-build-merger <android-build-merger@google.com> 1448318247 +0000

Merge "Add support for file descriptors and vectors thereof" am: 8f237272e0
am: 0ebbd1ef19

* commit '0ebbd1ef19a4a4f6b0dfcc8d8d7c625ab5211f9d':
  Add support for file descriptors and vectors thereof