Neal Nguyen 73bbcc4d02 am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo ...

Merge commit 'e96e235865830e2f0ee54e22feb20f26c3390999' into kraken

* commit 'e96e235865830e2f0ee54e22feb20f26c3390999':
  Adding a few host-based stress tests for Apps on SD.

2010-05-06 12:43:48 -07:00

..

config

…

java

am f7896449: merge from open-source master

2010-05-05 16:00:01 -07:00

jni

Merge "Add UUID property for adapter." into kraken

2010-05-05 15:25:54 -07:00

res

am f7896449: merge from open-source master

2010-05-05 16:00:01 -07:00

tests

Adding a few host-based stress tests for Apps on SD.

2010-05-05 18:17:35 -07:00