tree 7504889c906c3e17c435daeff740ccc874556bb1
parent 847514499f5920d073f5cd402dd0d3bbd19ac2c1
parent 3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb
author Marco Nelissen <marcone@google.com> 1422390789 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422390789 +0000

am 3ea395dd: am 4e853598: Merge "Fix printf format"

* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format