tree f37eed74221d708d8618236c45238d3fd96ca5f7
parent 14cece23e88943f9253f23d34b941a7761cb555e
parent d33d4b8aa610fafd763e15a557b3e07f5ad6f2f7
author TreeHugger Robot <treehugger-gerrit@google.com> 1526009047 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1526009047 +0000

Merge "p2p: p2p_go_ht40 won't take effect" into pi-dev