| commit | ece923782ee9aa0593f88e2838afb98ab12501bd | [log] [tgz] |
|---|---|---|
| author | Natalie Silvanovich <natashenka@google.com> | Tue Mar 10 18:15:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 10 18:15:14 2015 +0000 |
| tree | 98f92d836f4bc1dcee876e9a3b1c4869be1b5279 | |
| parent | d2102144818c8d5f0c9069b0b8a1546cdb867aed [diff] | |
| parent | 6285a598c2ce655ef7d93dfc616fde4ddc5c2f85 [diff] |
am 6285a598: am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer overrruns." * commit '6285a598c2ce655ef7d93dfc616fde4ddc5c2f85': Fun with buffer overrruns.