commit | 25354d605d6402b3d1de8647ad752fa6af1b8b4c | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Tue Jun 21 05:34:26 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 21 05:34:26 2011 -0700 |
tree | 6d974993635510cc98066826dbea8c8b00298a59 | |
parent | f70e6700c50a9236f1108db190510f4baefefe53 [diff] | |
parent | 97ae42d71849d02fa2a9766bf29d16adffdb6981 [diff] |
am 97ae42d7: am 02c5d31f: am 6aef5092: Merge "emulator opengl: added Bind texture to EGLImage/surface" * commit '97ae42d71849d02fa2a9766bf29d16adffdb6981': emulator opengl: added Bind texture to EGLImage/surface