tree bf9164c71c760e2958ad48e5e85fb967f198d4ef
parent 4391d215e13da52f287ff8d70fa52c52c84c9772
parent b0361b1c11f7b80364e5e7ed70086cf710ea737e
author David Turner <digit@android.com> 1308681852 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308681852 -0700

am b0361b1c: am 022254b8: am f4c9f254: Merge "opengl renderer: Fixed colorBuffer texture creation."

* commit 'b0361b1c11f7b80364e5e7ed70086cf710ea737e':
  opengl renderer: Fixed colorBuffer texture creation.