| commit | e611df831a1e9d380c4bc337c71a5f8599462c53 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Wed Aug 10 12:26:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 10 12:26:57 2011 -0700 |
| tree | bd55fd92206a55010f26eb1cf6247cfe38d51938 | |
| parent | d15c81b4a6d20747fef2372728559c15d836f46d [diff] | |
| parent | 1b0a25eecf50c9930e8ce2656bd43e1ee7b7c006 [diff] |
am 1b0a25ee: am 5d1dc7c9: am f7e07ec9: Merge "opengles emulator: make glFramebufferTexture2D work" * commit '1b0a25eecf50c9930e8ce2656bd43e1ee7b7c006': opengles emulator: make glFramebufferTexture2D work