| commit | 011550e1f2f20e66c429c2d854dcaf18c1f6c30c | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Sat Jul 18 01:05:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 01:05:25 2015 +0000 |
| tree | 580bd7b4b9540c25b3369655e072ea01eb64d444 | |
| parent | ef53ecbfd37220254bd9b458ab2d675c856fa176 [diff] | |
| parent | 3699c60323aca45eb0e385d6b4a27bd5861fadf2 [diff] |
am 3699c603: am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit '3699c60323aca45eb0e385d6b4a27bd5861fadf2': Fix AssetAtlas usage in BitmapShaders