OSDN Git Service

am 16c97c12: (-s ours) Merge "Double number of tile textures allocated - do not merge...
authorChris Craik <ccraik@google.com>
Fri, 14 Oct 2011 00:42:57 +0000 (17:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Oct 2011 00:42:57 +0000 (17:42 -0700)
* commit '16c97c12719fc27c990fc4b53f19ffd7b88f17d4':
  Double number of tile textures allocated - do not merge


Trivial merge