Jack Wang e5fa335b0d am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair ...

Merge commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b' into eclair-mr2-plus-aosp

* commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b':
  Make perf metrics collection & output via instrumentation simpler

2009-11-16 15:29:15 -08:00

..

android/test

am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair

2009-11-16 15:29:15 -08:00

junit

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00