OSDN Git Service

Merge "Fix alpha compositing in the shaders to work with premultiplied alpha textures...
authorNicolas Roard <nicolas@android.com>
Fri, 7 Jan 2011 22:59:07 +0000 (14:59 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Jan 2011 22:59:07 +0000 (14:59 -0800)

Trivial merge