tree a52083bb728f8a72891806171f8cd4dce4454386
parent bd4ed9606170d5d49281724bafdd3082a77e7b3c
parent 44039c689e0f117cc581c434e068436a044baa9e
author Jean-Baptiste Queru <jbq@google.com> 1329172796 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329172796 -0800

am 44039c68: am f987c05c: am 9ce69a5f: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"

* commit '44039c689e0f117cc581c434e068436a044baa9e':
  Make sure __u64 is defined even for strict ansi or -std=c99