tree 05a2a0a18780c1411aad65b3f32ee45a18247369
parent 22aa6c12199820019d984bbb0dab4fec37b8cd0e
parent 31c3b35558a71239c23d33c204c0adeb5ab49adc
author Richard Frankel <rofrankel@google.com> 1470257168 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1470257168 +0000

Merge "conman:  Experiment to prevent joining the WLAN on 2.4 GHz."