| commit | 45dee38b28fc4b122e56325546d0ea9a22e984a4 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Thu Jun 23 07:46:47 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 23 07:46:47 2011 -0700 |
| tree | 1be91fac1f2e71512c54c6cca6f672ee685fbdaf | |
| parent | 405acc2bf1d1a0b6ded1d62976718c3fea97c851 [diff] | |
| parent | 25354d605d6402b3d1de8647ad752fa6af1b8b4c [diff] |
am 25354d60: am 97ae42d7: am 02c5d31f: am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface" * commit '25354d605d6402b3d1de8647ad752fa6af1b8b4c': emulator opengl: added Bind texture to EGLImage/surface