commit | 2db4ff57d501a0ebc4970575525396370f21b36d | [log] [tgz] |
---|---|---|
author | Jesse Hall <jessehall@google.com> | Fri Feb 24 12:13:46 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 12:13:46 2012 -0800 |
tree | c43739b9f9bbee9261455659b3bd3ee2420aaee5 | |
parent | f3c068c79ab7cd5cba1a8af514c4ceedf17ede62 [diff] | |
parent | 23abe1ec1fff3e0e8242aa842865f691ac73040b [diff] |
am 23abe1ec: am f5229261: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1 * commit '23abe1ec1fff3e0e8242aa842865f691ac73040b':