| commit | 85d3f59ca0fcce0d405d9a024c1e5ff7352803a2 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Tue Nov 17 07:34:53 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 07:34:53 2009 -0800 |
| tree | 393e0338eebdde3f54b5a4c995b07bc36bf852bd | |
| parent | 90ea9af3e1f531b1cfcbe9443c26dec9082f75fd [diff] | |
| parent | 8d0e14723312a9f8286ba95cc559ee000eab1b82 [diff] |
am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2 Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82' * commit '8d0e14723312a9f8286ba95cc559ee000eab1b82': More GLSurfaceView cleanup.