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