tree af0dde55ccc67c70ebdcadea5912a2a5e6e2c0cb
parent 38cf0704f6fbfa6d41d5d10488ce25e645adb835
parent 8da106ebf31d725c00c1910a51f6e1cfb0d8c052
author Elliott Hughes <enh@google.com> 1390012921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390012921 +0000

am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
  Don't confuse stat and stat64.