| commit | 34c0fb183767b80e93a7cd77233ead5fe50bd822 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Tue Apr 30 19:32:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 19:32:39 2013 -0700 |
| tree | f2b2eddc50db39c1a634f5629b1646052bf6ea60 | |
| parent | ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2 [diff] | |
| parent | cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a [diff] |
am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev * commit 'cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a': Fix glGetUniformIndices JNI prototype