commit | e62c67f6e9b39415faec2bfef7c52de1c50cff53 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Tue May 03 13:43:26 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 13:43:26 2011 -0700 |
tree | a70b6bc6fd8905dfdfce699ed21a5e353890437c | |
parent | a6eebf5eaf9420f986b3a042cd589047c7c1e57f [diff] | |
parent | 43a4beea240f848546b2bb7f59a789a1a07dfcb9 [diff] |
am 43a4beea: am 1dac46ff: Merge "Emulator Opengl - adding preliminary version of GLESv2 encoder" * commit '43a4beea240f848546b2bb7f59a789a1a07dfcb9': Emulator Opengl - adding preliminary version of GLESv2 encoder