| commit | 62a2696cd2b7387ce20ec9cb9805563f313da86a | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Sat Jul 18 00:37:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 00:37:17 2015 +0000 |
| tree | 50d9144663cd97326b653721639c014e37346bfa | |
| parent | 931d3cc975bd717b62645bebcda95e56882ecdbc [diff] | |
| parent | fbd2d949587b1b7a14f98f5ed3fb33c3b4978a93 [diff] |
am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit 'fbd2d949587b1b7a14f98f5ed3fb33c3b4978a93': Fix AssetAtlas usage in BitmapShaders