OSDN Git Service

am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
authorChris Craik <ccraik@google.com>
Sat, 18 Jul 2015 00:07:13 +0000 (00:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 18 Jul 2015 00:07:13 +0000 (00:07 +0000)
commitb6e41a08826d01dba3ad30c14e72e3531d22d0ad
treef68a4c9ae332b6491f94f3d5cfcc390b223713d5
parent1f72739a0b546d8a26ec0f704fcfeaf9d051fd37
parent0bb5c26bcea4b171583e57134b9717c77fbdcb14
am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev

* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders