tree 2fe824bb33d1f96387d18a366f051938a1bc3aae
parent 790b6d092ce2702c9d561dfd2c873b5793e765d2
parent 98c197d826f95a82de41e16350f58a70a7ad23c6
author Ed Heyl <edheyl@google.com> 1381273076 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381273076 -0700

am 98c197d8: merge in KQS81M

* commit '98c197d826f95a82de41e16350f58a70a7ad23c6':
  GLConsumer: Add query for current frame number.
  Disable GLES 2.x rendering
  Initialize mIndent