tree a79a373158d7994592669492876ed4b48ec07b5c
parent 55347e65e229ed63f7e18cb5b82639174c0f54bb
parent 4406345cd62d3687ce590c357854472f7f906e6c
author Jesse Hall <jessehall@google.com> 1322858000 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322858000 -0800

Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1