OSDN Git Service

am e603d129: am 7a7307a0: Merge "Fix the flickering bug. We return any previous textu...
authorNicolas Roard <nicolas@android.com>
Wed, 26 Jan 2011 23:07:02 +0000 (15:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 23:07:02 +0000 (15:07 -0800)
* commit 'e603d129c53d3faa9f023197f13abd99276d39af':
  Fix the flickering bug. We return any previous textures used by the layer until we get the new one ready.


Trivial merge