OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluedroid.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c03040
7291285
)
am 72912851: (-s ours) Reconcile with jb-mr2-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 26 Jun 2013 00:02:17 +0000
(17:02 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 26 Jun 2013 00:02:17 +0000
(17:02 -0700)
* commit '
72912851ec38b96570ab60d19c175db1c73d53b5
':
Do not abort bonding if link disconnects during SDP after Auth cmplt
Trivial merge