tree 50a26b997958b2db8d64ade8618d72b30a148992
parent dda456b5da3d59a71b486aa85912dec65b3089b2
parent f9ee77ab52941e6f3be8e97fb0a150480ea8760a
author Narayan Kamath <narayan@google.com> 1424783342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424783342 +0000

am f9ee77ab: am 9e95c515: Merge "Fix a printf format warning."

* commit 'f9ee77ab52941e6f3be8e97fb0a150480ea8760a':
  Fix a printf format warning.