| commit | 7b2db8cd0b3f932ca2105c8347ea09415866650e | [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 | c13657903573c911c2ad799dc4fbcfdb1bad6565 | |
| parent | e927c69f3cf42c61d84b33a2c2ae95e59ab36ea1 [diff] | |
| parent | 75a3e54e661133cca373cad7a6fe398e17440aa5 [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