OSDN Git Service

am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com...
authorNick Pelly <npelly@google.com>
Mon, 12 Oct 2009 19:38:48 +0000 (12:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2009 19:38:48 +0000 (12:38 -0700)
commitdffcd85541451185d1cca449430bee276f3772d2
tree3a2fb6840affea12c99eb0b68a3231395ddf0c04
parentc0cfe8f52648917655f7600d5cb07414894dac80
parentb2ad0f18bc030535687aed67f5c3a3139045dd84
am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84'

* commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84':
  Introduce BluetoothAdapter.getDefaultAdapter().
api/current.xml