| commit | fbd2d949587b1b7a14f98f5ed3fb33c3b4978a93 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Sat Jul 18 00:24:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 00:24:55 2015 +0000 |
| tree | c1e5dd5540af577eaedf4d32da0a2d4a727825cc | |
| parent | 9f71f05be09020136dfa8a9cad52d0200dd7f5d0 [diff] | |
| parent | b6e41a08826d01dba3ad30c14e72e3531d22d0ad [diff] |
am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit 'b6e41a08826d01dba3ad30c14e72e3531d22d0ad': Fix AssetAtlas usage in BitmapShaders