| commit | a3137783dcbe06bb4da04a722c727eb361851aa8 | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Wed Mar 30 08:21:07 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 30 08:21:07 2011 -0700 |
| tree | cad1c7fe71c7e314ccdfb089e6ea4ba668e1ca74 | |
| parent | e9f8263d2a516ef56917a21fe90382cefbca6f38 [diff] | |
| parent | 2e5f0d15fbb875e67845503427a8ee204261ca5b [diff] |
am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder" * commit '2e5f0d15fbb875e67845503427a8ee204261ca5b': Emulator opengl - Opengl ES 1.1 encoder