tree 829a86fa757d22be92b5393b3674b2089daa68da
parent 3e59c32a1b90946931d082f90f603c70d30ef50c
parent 2f74e36e84064ffa32f82f3decf36b653c7e4fad
author Vinit Deshpande <vinitd@google.com> 1425934058 -0700
committer Vinit Deshpande <vinitd@google.com> 1425934058 -0700

am "Cumulative patch from commit fb09ed338919db09f3990196171fa73b37e7a17f (DO NOT MERGE)"

merged from partner/m-wireless-wifi-dev
2f74e36 Cumulative patch from commit fb09ed338919db09f3990196171fa73b37e7a17f (DO NOT MERGE)