Dan Egnor 341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread ...

Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec

2010-07-20 11:30:17 -07:00

..

config

…

java

resolved conflicts for merge of 9bc4039a to gingerbread

2010-07-20 11:30:17 -07:00

jni

Ignore attempts to finish events on unregistered channels.

2010-07-16 15:41:07 -07:00

res

Fix 2797185: Re-enable thumbnail generation in framework

2010-07-13 18:35:14 -07:00

tests

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 15:15:44 -07:00