OSDN Git Service

am 72912851: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 00:02:17 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 00:02:17 +0000 (17:02 -0700)
commit586bb6e74b9e47477b5ea584c584b275f33b7238
tree52198bf7c0f5c1e54afc92bccdefc544e505c891
parent4c03040fa975cc23ea27b183908b1008bb3231f9
parent72912851ec38b96570ab60d19c175db1c73d53b5
am 72912851: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '72912851ec38b96570ab60d19c175db1c73d53b5':
  Do not abort bonding if link disconnects during SDP after Auth cmplt