tree b3a5dc8ec5f4d033ce08e0fe8fa26137f51f59e1
parent 6b58bc2ba25aa5f71ee106e2d97c638844010538
parent d1aa67b8e19ae96bd2ae4e6719d13902a8b6d845
author Chih-hung Hsieh <chh@google.com> 1418331900 +0000
committer android-build-merger <android-build-merger@google.com> 1418331900 +0000

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

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