commit | ce7ef7520f0a31bff1171ca31bf3ba74764bef32 | [log] [tgz] |
---|---|---|
author | Chris Craik <ccraik@google.com> | Sat Jul 18 00:08:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 00:08:47 2015 +0000 |
tree | 42a8875297cdaccfe6bb3af9257456716af97144 | |
parent | 495cd5398b6da2f69f218320565cd56dec12f2e9 [diff] | |
parent | 0bb5c26bcea4b171583e57134b9717c77fbdcb14 [diff] |
am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev * commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14': Fix AssetAtlas usage in BitmapShaders