| commit | 0bb5c26bcea4b171583e57134b9717c77fbdcb14 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Jul 17 23:59:14 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 17 23:59:17 2015 +0000 |
| tree | f30bfaaa722b76dff1434d4e82416f375cfb1f1e | |
| parent | 57ee4b87fee76d9f85d28a09e370a92b5839a8dd [diff] | |
| parent | 6ad690e16f8e139bfd29a035b52ab616d813a74b [diff] |
Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev