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