tree 85913a7fa6127d4d3cc9a7ee9d427885e8ad5e6e
parent 5261fd2cacc8a53643089cab9fbbeb8142f98dea
parent 3e0e7eea490d2080d0290a1e2709e98d8fcf0ebf
author Elliott Hughes <enh@google.com> 1402094347 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402094347 +0000

am 3e0e7eea: Merge "Remove getdents from bionic."

* commit '3e0e7eea490d2080d0290a1e2709e98d8fcf0ebf':
  Remove getdents from bionic.