tree ca234c3fee208aae87b1b4a05f66b06b3c4d295c
parent 4b5a0e1ad76d76d6a8793f61e3c0902ea4628ce7
parent f281fd02e9eebea3de9c07412c5b66647ca0c290
author Elliott Hughes <enh@google.com> 1380646936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380646936 -0700

am f281fd02: Merge "Better statfs/fstatfs glibc compatibility."

* commit 'f281fd02e9eebea3de9c07412c5b66647ca0c290':
  Better statfs/fstatfs glibc compatibility.