Jeff Brown f3a0a60917 Merge "Remove type tests when recycling input events."

2011-12-03 17:35:19 -08:00

..

java

Merge "Remove type tests when recycling input events."

2011-12-03 17:35:19 -08:00

jni

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

2011-12-02 17:57:09 -08:00

res

Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

2011-12-01 06:29:53 -08:00

tests

Fixing the build

2011-11-30 19:36:18 -08:00