Danica Chang cbbd3a1b95 am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread ...

Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp

* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly

2010-07-19 13:50:49 -07:00

..

config

…

java

am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread

2010-07-19 13:50:49 -07:00

jni

am ace999b0: Ignore attempts to finish events on unregistered channels.

2010-07-16 16:03:07 -07:00

res

Fix 2797185: Re-enable thumbnail generation in framework

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

tests

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