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