tree 5c4b7a0b14103a360b2615f8732012ca76ac68ad
parent a907a5b72d1df189dcb511ac24b43362b202c679
parent 25fc03f3e10570eed1283067c00e24bb0e5b742b
author Linux Build Service Account <lnxbuild@localhost> 1365035941 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1365035941 -0700

Merge "wlan: Use different wpa_supplicant.conf between wcn and ath6kl driver"