tree 820ea5eb6de9a48561617d8b123b492ce0f47079
parent 50ba7354e0543c87b326d15822bca8b5e7f811dd
parent 61a004c05f100741048d284fa527ac28c242d0bc
author Elliott Hughes <enh@google.com> 1429309841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429309841 +0000

am 61a004c0: Merge "Fix more buffer overruns."

* commit '61a004c05f100741048d284fa527ac28c242d0bc':
  Fix more buffer overruns.