commit | 03c0ab677135f8940346cea8a22d915d25e9d0dd | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Wed Mar 30 16:34:50 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 30 16:34:50 2011 -0700 |
tree | 6a3d5348cbd31d0d8a44dc098653fcaa476aabdb | |
parent | 8eae16f9ba2ac4673ed9135081e93191f5797fee [diff] | |
parent | a3137783dcbe06bb4da04a722c727eb361851aa8 [diff] |
am a3137783: am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder" * commit 'a3137783dcbe06bb4da04a722c727eb361851aa8': Emulator opengl - Opengl ES 1.1 encoder