tree cab90712e598af945b8592dd4498e8bcfee77531
parent a25bd013cce925c372fb0a60e5aad9d9be0b248c
parent d7ff03d48f825360eec2a371e3361306f2fd721b
author Randy Pan <zpan@google.com> 1449705438 -0800
committer Randy Pan <zpan@google.com> 1449784492 +0000

DO NOT MERGE Merge remote-tracking branch 'goog/master' into mm-wireless-internal-dev

Pull in WiFi changes from goog/master to partner branch.

Merge from d7ff03d48f825360eec2a371e3361306f2fd721b