tree 1f073e742e44fb79d1051d0ef19a7fa6d57bd11d
parent 05bae52b4de4f4e516ba26f4bf283f13b834c831
parent ff787d557db719adea0fdf2679667500c65cf74d
author Vinit Deshpande <vinitd@google.com> 1425934058 -0700
committer Vinit Deshpande <vinitd@google.com> 1425934058 -0700

am "Cumulative patch from commit 3e7f1c7980c6e9fc7173f78aa72b2761fcd8924d (DO NOT MERGE)"

merged from partner/m-wireless-wifi-dev
ff787d5 Cumulative patch from commit 3e7f1c7980c6e9fc7173f78aa72b2761fcd8924d (DO NOT MERGE)