commit | fe2bed335f3bb2db935b368a29978c142c7e6294 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Sat Aug 13 16:13:57 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 13 16:13:57 2011 -0700 |
tree | b5386af556aff170804ffa468c0fa957bc52cd66 | |
parent | bc034f45231afc99edc57421b08d5a19070557ae [diff] | |
parent | 34552f4cf8796a27666d7abbdaeff8a39a2bdbf3 [diff] |
am 34552f4c: am 584bcf8a: Merge "opengles emulator: fix shader/program info log functions" * commit '34552f4cf8796a27666d7abbdaeff8a39a2bdbf3': opengles emulator: fix shader/program info log functions