OSDN Git Service

am 2ac41948: am 1e83690c: Merge "assert -eng builds when calling a GL function withou...
authorMathias Agopian <mathias@google.com>
Thu, 27 Sep 2012 01:51:49 +0000 (18:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Sep 2012 01:51:49 +0000 (18:51 -0700)
* commit '2ac4194854a70c6e319b1b3b647344e595082b38':
  assert -eng builds when calling a GL function without a context


Trivial merge