OSDN Git Service

am 36a3f941: am 60ff1387: am 5d5cc227: Merge "We shouldn\'t have a <sys/dirent.h...
authorElliott Hughes <enh@google.com>
Thu, 9 Jan 2014 00:37:51 +0000 (00:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jan 2014 00:37:51 +0000 (00:37 +0000)
* commit '36a3f941d07ad58b7df1152b1cfb6041604eb666':
  We shouldn't have a <sys/dirent.h> that's a subset of <dirent.h>.


Trivial merge