| commit | cd843caa3704a14d02a2b8df6e72be8a2f53049c | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Tue Jul 14 18:21:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 18:21:45 2015 +0000 |
| tree | 8ccd03c12f9f4a83662a39e71fbff6e810d128c3 | |
| parent | 0c1df463034a32cbaac35d0400317d58222742aa [diff] | |
| parent | 230d8243de5ef33a18c610a7b2f21fb6caa8e277 [diff] |
am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev * commit '230d8243de5ef33a18c610a7b2f21fb6caa8e277': Fix unsafety in SkiaShader storage, and texture unit accounting