| commit | 944b4f80e5b7af35a001e068f6ce6fc5ce308907 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Sep 23 01:36:15 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 23 01:36:15 2011 -0700 |
| tree | b6d8389ee81699e204c41bdc6f5dd5935aec9f5d | |
| parent | 7cd5aeb7c7a109712a660c89d50fb67d35471081 [diff] | |
| parent | 6ddbd1563d84a7b18607aa67c1f5f5e4095f816f [diff] |
am 6ddbd156: resolved conflicts for merge of 4e6af749 to gingerbread-plus-aosp * commit '6ddbd1563d84a7b18607aa67c1f5f5e4095f816f': emulator: opengl: Back-port GLES emulation from the master tree.