tree 283afd4656ad281fa0394172384b5a319d4b2b01
parent 0cf74d8fdd7b586bdd9adfea1304d999f2706baf
parent cb9a648fab74514b84acc53081cec128b395ce9d
author David Turner <digit@android.com> 1309963538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963538 -0700

am cb9a648f: am 6930d610: Merge "opengles renderer: added CHECK_GL_ERROR defie for gl debugging"

* commit 'cb9a648fab74514b84acc53081cec128b395ce9d':
  opengles renderer: added CHECK_GL_ERROR defie for gl debugging