| commit | f510c6b65190bae1980c76f83897951c6665ec4a | [log] [tgz] |
|---|---|---|
| author | Bo Hu <bohu@google.com> | Fri Sep 11 22:14:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 22:14:41 2015 +0000 |
| tree | 7e02aa28da8f2a0b20919e5b75ca1e57060d79f4 | |
| parent | d7240203f87917d54e93ce95c8ebe33b3be8c842 [diff] | |
| parent | 36c9629adb8e71d4ba5afdbce67c67f03ba76668 [diff] |
am 36c9629a: Merge "Fix glActiveTexture invalid parameter bug" * commit '36c9629adb8e71d4ba5afdbce67c67f03ba76668': Fix glActiveTexture invalid parameter bug