tree 1b6260658735b059cf58574428c863ec0423f7b8
parent bc59ca4bdbd993c1eb5c2a74f9b35857619da285
parent 4c23a0ec161891a1248b7aea67fbfd1d00bbd199
author Chih-hung Hsieh <chh@google.com> 1418331296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418331296 +0000

am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
  Adjust format strings to work on both 32-bit and 64-bit builds