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
This commit is contained in:
Jesse Hall 2011-12-02 17:57:09 -08:00 committed by Android Git Automerger
commit 7b2db8cd0b

Diff Content Not Available