aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothAdapter.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-01-28 18:45:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-28 18:45:14 -0800
commit307af8daa621c14b480b7e61fcea9f4c5b4a59bb (patch)
treefcdc3f9ad9f0401fd879f4b0d935c7848c27cb58 /framework/java/android/bluetooth/BluetoothAdapter.java
parent253e84a559e73b6383a68375f08f00a16da6e93a (diff)
parent3ba236c74ddde5195ae26a9bce916f59723ac334 (diff)
am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b': Do Not Merge Connect other profiles when priority is auto connect.
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions