commit | b7ac716b2b31a8536d0379c6dd85b8f7e74017f1 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Wed Aug 26 20:35:21 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 20:35:21 2015 +0000 |
tree | adcb0543af4064db78d96a9d999c86ba0c30eb93 | |
parent | f86c0757747f32fcabb6260d997c9e066399f528 [diff] | |
parent | 4efc67aa983f15ae929be4caace19289720ba544 [diff] |
am 4efc67aa: am 74d08b26: (-s ours) am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEAD * commit '4efc67aa983f15ae929be4caace19289720ba544': DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.