tree a79a373158d7994592669492876ed4b48ec07b5c
parent 04bd27ebed36d396dfdca0b6c8e6f6b08d8e7e0d
parent 6d90c1c6fedc7add177418324ba5e591af543fa4
author Jesse Hall <jessehall@google.com> 1322858122 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322858122 -0800

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

* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
  Disable GLES20Canvas on emu w/o native GL