OSDN Git Service

am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
authorMichael Chan <mchan@android.com>
Tue, 10 Nov 2009 19:06:36 +0000 (11:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Nov 2009 19:06:36 +0000 (11:06 -0800)
commit4fcf94c47b5526e1ee64854d7e25bfcac171885b
tree5c7387a9990fed2754bf3d6217247dea7ef34569
parentc3ace180d0853185da19b49e9668324faa9f468e
parent5469ff8b3f9966c6f141078b37da5f178b7825e4
am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground

Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalBluetoothManager.java