tree eb2e457367cc50270de999a22b16b32f2e72cf31
parent e756b973944f4cd1e2f4ee92684e2c136df74c1e
parent 216983bceec7c450951e2fbcd076b5c75d432e57
author Vinit Deshpande <vinitd@google.com> 1425934059 -0700
committer Vinit Deshpande <vinitd@google.com> 1425934059 -0700

am "Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3"

merged from partner/m-wireless-wifi-dev
216983b Cumulative patch from commit 2c0efd9e49b15da163cee659409eee85390620c3