Merge "Revert "Set channel info only to avoid responder role breakage."" into nyc-dev
authorWei Wang <weiwa@google.com>
Mon, 25 Apr 2016 20:14:22 +0000 (20:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 20:14:22 +0000 (20:14 +0000)
commitc6c80bd196022c7804e5a947b9aeb5b2bfc4a6c2
treed969667f2283b566a44fc5c7d9528c99f6464669
parent9bd8d577e6ad03fc0340611e464c5df908173e04
parent931b5c3490fadeaee335d8063d87b76167bb4af9
Merge "Revert "Set channel info only to avoid responder role breakage."" into nyc-dev
am: 931b5c3

* commit '931b5c3490fadeaee335d8063d87b76167bb4af9':
  Revert "Set channel info only to avoid responder role breakage."

Change-Id: I3fde6d17c40c2fb11bf73b3f4ea7f1010fed87bd