OSDN Git Service

am 2e470dc4: Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"
authorMatthew Xie <mattx@google.com>
Tue, 22 Apr 2014 13:36:22 +0000 (13:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Apr 2014 13:36:22 +0000 (13:36 +0000)
commit1b562939899f7c91c437b390e6e216c7c53acfd6
tree433af0af0d16d060701b5500851594292c572374
parentc352606db3258360fc32cf435c0ad23e55a1cc67
parent2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb
am 2e470dc4: Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"

* commit '2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb':
  Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue
stack/btm/btm_sec.c