tree 2b7cb9c623d7e27b60c7105292a19c9282c59dc2
parent b54d73d9728a879ef525e57b3af0bc26be82773d
parent 22b99e3a9a5797deada897102e71e9a88ae46d24
author chh <chh@google.com> 1416945437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416945437 +0000

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

* commit '22b99e3a9a5797deada897102e71e9a88ae46d24':
  Fix potential format string vulnerability