am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1

* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
  Disable GLES20Canvas on emu w/o native GL
This commit is contained in:
Jesse Hall 2011-12-02 12:35:22 -08:00 committed by Android Git Automerger
commit 75a3e54e66

Diff Content Not Available