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