Mike Reed 70660425c0 am 9f954cf2: Merge "Do not merge" into eclair ...

Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
  Do not merge

2010-01-20 13:21:26 -08:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair

2010-01-19 19:59:19 -08:00

jni

am 9f954cf2: Merge "Do not merge" into eclair

2010-01-20 13:21:26 -08:00

res

Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.

2010-01-15 16:20:36 -08:00