commit | 6ece5eeb7081f0b4e462d870e5ff2fddf7d5f2e9 | [log] [tgz] |
---|---|---|
author | David Turner <digit@android.com> | Mon May 02 13:29:59 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 02 13:29:59 2011 -0700 |
tree | a71837d2919784087c7636678a7b50247e5020e0 | |
parent | 322b38a818d5daae43f6abe315847b36f1f78f8e [diff] | |
parent | 7da2a217ee184dfc688a0199ad7caa3fff3dd94e [diff] |
am 7da2a217: am 27c128d7: Merge "GLESv1 extensions" * commit '7da2a217ee184dfc688a0199ad7caa3fff3dd94e': GLESv1 extensions