John Reck 4b747570f7 am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 ...

* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
  Fix updateDoubleTapZoom logic

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

..

java

am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1

2011-12-02 17:57:29 -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