commit | e2a5c184e396b748e390672996ebeca25c2b9b83 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Tue Jul 14 17:35:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:35:50 2015 +0000 |
tree | b607f28804f135e46e8cd04fd80d743d41531830 | |
parent | 5eaf24126d4496f9a157280007b8bb89500a3ea1 [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