tree 2a0378e833d921aa65120551bd0374275ba99eef
parent ce285571ceb3b5165e81eb8522097d203696b918
parent c42111c3ed4c48a957b810c3f4d6f9f56f2f5931
author Andrew Hsieh <andrewhsieh@google.com> 1373301285 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373301285 -0700

am c42111c3: am 7fc5e915: Merge "Fix <inttypes.h> declaration for pointer-related PRI/SCN macros."

* commit 'c42111c3ed4c48a957b810c3f4d6f9f56f2f5931':
  Fix <inttypes.h> declaration for pointer-related PRI/SCN macros.