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

Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-mr2

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

2009-11-16 15:25:06 -08:00

..

android/test

am e0cadd7c: Merge change Iffbb6e55 into eclair

2009-11-16 15:25:06 -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