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