commit | 168dfe71bfafebaa26b6f75df553f5fad7607669 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Tue Nov 06 20:43:06 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 20:43:06 2012 -0800 |
tree | 6003150f794d9c48985d408a8b669e49105630c1 | |
parent | c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e [diff] | |
parent | 5e530e02bc3073a2e2469df3c333ae14f1b37433 [diff] |
am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" * commit '5e530e02bc3073a2e2469df3c333ae14f1b37433': Fix return type of glGetAttribLocation and glGetUniformLocation