tree 3d06cc34fde5e48e1a5dd47c05a0b90d5ce7f73e
parent aadd0208493ce72141b9dd755c280fde87bf79d2
parent 2c2415a552b62016886af62419080ca7ac327871
author Marco Nelissen <marcone@google.com> 1422402039 +0000
committer android-build-merger <android-build-merger@google.com> 1422402039 +0000

am 3ea395dd: am 4e853598: Merge "Fix printf format"
automerge: 2c2415a

* commit '2c2415a552b62016886af62419080ca7ac327871':
  Fix printf format