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

* commit '8912a72cb2e97f595d3026da973ae99db1bb64b9':
  Fix time-related ScaleGestureDetector methods

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

..

java

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

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

jni

Merge "Use LruCache instead of GenerationCache in libhwui"

2012-11-29 13:58:57 -08:00

res

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

2012-11-29 14:32:56 -08:00

tests

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

2012-11-16 10:37:54 -08:00