Adam Powell 8912a72cb2 am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev ...

* commit '462633695774a3cfd84b5c729266d039ec686a64':
  Fix time-related ScaleGestureDetector methods

2012-11-29 14:27:01 -08:00

..

java

am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev

2012-11-29 14:27:01 -08:00

jni

am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

2012-11-08 06:14:33 -08:00

res

am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev

2012-11-29 14:26:49 -08:00

tests

am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev

2012-11-15 11:54:43 -08:00