tree 98f92d836f4bc1dcee876e9a3b1c4869be1b5279
parent d2102144818c8d5f0c9069b0b8a1546cdb867aed
parent 6285a598c2ce655ef7d93dfc616fde4ddc5c2f85
author Natalie Silvanovich <natashenka@google.com> 1426011314 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426011314 +0000

am 6285a598: am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."

* commit '6285a598c2ce655ef7d93dfc616fde4ddc5c2f85':
  Fun with buffer overrruns.