| commit | 54cf27d7bbe27b1096f5e060c540f07dac07f1d0 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Dec 02 12:35:22 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 12:35:22 2011 -0800 |
| tree | a79a373158d7994592669492876ed4b48ec07b5c | |
| parent | 04bd27ebed36d396dfdca0b6c8e6f6b08d8e7e0d [diff] | |
| parent | 6d90c1c6fedc7add177418324ba5e591af543fa4 [diff] |
am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 * commit '6d90c1c6fedc7add177418324ba5e591af543fa4': Disable GLES20Canvas on emu w/o native GL