| commit | 248ba3e50c8fec456d47ddce648c9bf0335415fe | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Mon Jul 11 15:57:02 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 11 15:57:02 2011 -0700 |
| tree | d1bc2b661658114067066606f51bc36866ad9bbf | |
| parent | 87c04589e498f669e1a16a849a2e6e7770bd5bc0 [diff] | |
| parent | a20d6fe07728a4a16a0bae9b154ad12c0d4dacc8 [diff] |
am a20d6fe0: am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix" * commit 'a20d6fe07728a4a16a0bae9b154ad12c0d4dacc8': GLES2 translator: DeleteShader/Program fix