tree f27fca34738790decf4aaa82a37548d0946e8983
parent 09efe0ac2a0f34eb951c9a2b91b2d15e3ab7b7ca
parent 45aa022710165c321cdec9a475f269d6932fe1f3
author chh <chh@google.com> 1416942252 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416942252 +0000

am 45aa0227: Merge "Fix potential format string vulnerability"

* commit '45aa022710165c321cdec9a475f269d6932fe1f3':
  Fix potential format string vulnerability