OSDN Git Service

am 8fe49117: (-s ours) am 71334dcd: Do not reject valid connection parameter updates
authorAndre Eisenbach <eisenbach@google.com>
Thu, 27 Aug 2015 10:54:34 +0000 (10:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:54:34 +0000 (10:54 +0000)
* commit '8fe49117ed231c02db07a65652ba1daa9148542d':


Trivial merge