| commit | 521d79b16cf76e1319937ad2f79e571949f42b0c | [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 | 8e857d0bdabe2d7da6cd8b33b3816bcccc656ffa | |
| parent | 44a63fa259233d09a4f5e2f30b498edc8ab9aff7 [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.