tree 74641d51cbd23b8b374e5440b1875e40be94b470
parent e4723161d5b89cd4a36f8b297d2d343a2c5ba8bf
parent 7c808b29d5cea61e5bda90a1b0f2f0e669ee135e
author Elliott Hughes <enh@google.com> 1372805436 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372805436 -0700

am 7c808b29: am feec97a7: Merge "Fix inttypes.h PRI?PTR and SCN?PTR macros."

* commit '7c808b29d5cea61e5bda90a1b0f2f0e669ee135e':
  Fix inttypes.h PRI?PTR and SCN?PTR macros.