tree 259eccdfe18e9499320339c5879152415cdd2f37
parent f11758bb58af4241817b0b374f913b39d1f32e44
parent c0ac9313e942fb7d3a027cec41904c18d8841521
author Elliott Hughes <enh@google.com> 1416952537 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416952537 +0000

am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."

* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.