OSDN Git Service

am 60ff1387: am 5d5cc227: Merge "We shouldn\'t have a <sys/dirent.h> that\'s a subset...
authorElliott Hughes <enh@google.com>
Thu, 9 Jan 2014 00:35:30 +0000 (00:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jan 2014 00:35:30 +0000 (00:35 +0000)
commit36a3f941d07ad58b7df1152b1cfb6041604eb666
treebd3e408c08a10f2383a53484b2ea1e28a11a84e3
parente4f4ef047c7240d5603ad4e65007f4b79a2fefa3
parent60ff1387f418faa24f0eb6f00e72ad1674b3bcaa
am 60ff1387: am 5d5cc227: Merge "We shouldn\'t have a <sys/dirent.h> that\'s a subset of <dirent.h>."

* commit '60ff1387f418faa24f0eb6f00e72ad1674b3bcaa':
  We shouldn't have a <sys/dirent.h> that's a subset of <dirent.h>.