Adam Powell 3e22d199a0 am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair ...

Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee'

* commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee':
  TransformGestureDetector is now ScaleGestureDetector - scope reduced.

2010-01-19 00:02:00 -08:00

..

config

…

java

am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair

2010-01-19 00:02:00 -08:00

jni

resolved conflicts for merge of d26707da to master

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

res

First pass at new device policy and administration APIs.

2010-01-17 15:10:24 -08:00