commit | 6285a598c2ce655ef7d93dfc616fde4ddc5c2f85 | [log] [tgz] |
---|---|---|
author | Natalie Silvanovich <[email protected]> | Mon Mar 09 18:26:53 2015 +0000 |
committer | Android Git Automerger <[email protected]> | Mon Mar 09 18:26:53 2015 +0000 |
tree | 9d78c94e67279560475bb55ce8db3b0b2e255656 | |
parent | 39d72dcdd162af365717956acd4280ead441a70a [diff] | |
parent | 7adb2828f48e57c620f232c64d7c012774fa80a3 [diff] |
am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer overrruns." * commit '7adb2828f48e57c620f232c64d7c012774fa80a3': Fun with buffer overrruns.