| commit | a6062265bd7a5e69891734ae0d927a3d3f5613b7 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Dec 02 17:57:09 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 17:57:09 2011 -0800 |
| tree | 013c352175e852ee33df7e19766b675e50b18f9b | |
| parent | 4ac6d7fae2c6ac64a7229028d6fe7e4342d9d428 [diff] | |
| parent | 54cf27d7bbe27b1096f5e060c540f07dac07f1d0 [diff] |
am 54cf27d7: am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 * commit '54cf27d7bbe27b1096f5e060c540f07dac07f1d0': Disable GLES20Canvas on emu w/o native GL