tree 4ec00619b77e28d6cea2a4704f3672acbe0d3972
parent cf9d4a9eccd22530a7fbb40e4424569730fac5dd
parent 61b8a98d748c44b161e652f53e4fcb3ad304d192
author Jean-Baptiste Queru <jbq@google.com> 1329173118 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329173118 -0800

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

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