Nick Pelly e10bbc50a6 am e74050a9: Merge change 25175 into eclair ...

Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp

* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
  Allow only System Service to send most Bluetooth intents.

2009-09-15 18:15:24 -07:00

..

config

…

java

am 64ce0f8f: Merge change 24200 into eclair

2009-09-15 17:13:20 -07:00

jni

Fix 2083478: Camera needs an auto-focus cancel API

2009-09-15 18:29:03 +08:00

res

Merge change 25175 into eclair

2009-09-15 21:08:37 -04:00