commit | 65d8b59b0ff71ec447eb17b693d1057c74e83b93 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Tue Jul 14 17:13:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:13:23 2015 +0000 |
tree | db9928e33f7919cd8e358d9f4264507adad0724e | |
parent | c9125d69ed02f5861e88f48bf6ff7b2ab643f9d8 [diff] | |
parent | 941bcedb4c03832cd54225217697c7b8cba6e07c [diff] |
am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev * commit '941bcedb4c03832cd54225217697c7b8cba6e07c': Fix unsafety in SkiaShader storage, and texture unit accounting