tree 2c03b2724d71a79a63eff8720b2caccf2052e1ce
parent caadbc5324cd4503450ac6bd9bb09c3c5fcb7430
parent 60393d45207b6548e1f61ca104fa59aecee87d30
author Romain Guy <romainguy@google.com> 1350607074 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350607074 -0700

am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev

* commit '60393d45207b6548e1f61ca104fa59aecee87d30':
  Add runtime debugging capabilities to OpenGL