tree 1dbaf3ff95badf9f07c030dd6c7196c8c5cd72f6
parent a2bee3af6fee5e64a02e320595c70acdd02f3b09
parent 50ba7354e0543c87b326d15822bca8b5e7f811dd
author Elliott Hughes <enh@google.com> 1429306373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429306373 +0000

am 50ba7354: am adc4a8b8: Merge "Use PRI* macros to fix the Windows build."

* commit '50ba7354e0543c87b326d15822bca8b5e7f811dd':
  Use PRI* macros to fix the Windows build.