| commit | b6e41a08826d01dba3ad30c14e72e3531d22d0ad | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Sat Jul 18 00:07:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 00:07:13 2015 +0000 |
| tree | f68a4c9ae332b6491f94f3d5cfcc390b223713d5 | |
| parent | 1f72739a0b546d8a26ec0f704fcfeaf9d051fd37 [diff] | |
| parent | 0bb5c26bcea4b171583e57134b9717c77fbdcb14 [diff] |
am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14': Fix AssetAtlas usage in BitmapShaders