tree 1d597901499ef4ee2c8f049ac31da9427e999000
parent 514126b2b59105427da8014a11fb1fc32e6a751c
parent cc12c74f7f65c571778989cd902eb5b9fa74fb11
author Jean-Baptiste Queru <jbq@google.com> 1327727347 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327727347 -0800

am cc12c74f: am e8004445: Merge "Make sure __u64 is defined even for strict ansi or -std=c99"

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