Adam Powell a948f4787b am 97b10853: am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair ...

Merge commit '97b108532f04f72af035e372be7b827f77888650'

* commit '97b108532f04f72af035e372be7b827f77888650':
  Edge of screen slop detection for ScaleGestureDetector.

2010-01-22 12:00:24 -08:00

..

config

…

java

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

2010-01-22 12:00:24 -08:00

jni

resolved conflicts for merge of d26707da to master

2010-01-12 11:53:42 -08:00

res

Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138"

2010-01-21 19:11:20 -08:00