tree c3c1285fafb48cadb4226cea03ce702ac7e18130
parent 55a17d6e6d453715d137c63be17404e5c24d30f4
parent 7a865a5de8214aa4975371b9d8a2165a01f6b69c
author Nick Pelly <npelly@google.com> 1254958575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254958575 -0700

am 7a865a5d: Merge change Ieed8be00 into eclair

Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2

* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
  Introduce BluetoothAdapter.getDefaultAdapter().