OSDN Git Service

am 1160e89d: am d171da97: GLConsumer: Add query for current frame number.
authorEino-Ville Talvala <etalvala@google.com>
Fri, 20 Sep 2013 18:19:41 +0000 (11:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Sep 2013 18:19:41 +0000 (11:19 -0700)
* commit '1160e89d31810f2ba66f8ab502281579115b39b0':
  GLConsumer: Add query for current frame number.


Trivial merge