OSDN Git Service

am 9c238709: Merge "Resolved conflicts & merged commit \'877123f5\' into mnc-dev...
authorAndre Eisenbach <eisenbach@google.com>
Thu, 21 May 2015 18:51:36 +0000 (18:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 18:51:36 +0000 (18:51 +0000)
* commit '9c2387096f3b909d3b44edfb710fd5f5155260f5':
  Static address is seen on scanner after unpairing
  Fix for chip capability version check


Trivial merge