Jason Parks ed38cf9089 am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread ...

Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.

2010-07-20 16:55:01 -07:00

..

config

…

java

am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread

2010-07-20 16:55:01 -07:00

jni

Merge "Add preliminary support for text rendering."

2010-07-20 16:43:31 -07:00

res

Add resource configuration flag to indicate whether USB host support exists.

2010-07-20 17:19:55 -04:00

tests

am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 16:25:27 -07:00