tree 1a95a70f62087192b79789d122fecfff31f46539
parent 0cbfafdf706d96a3b2838b8470196ba1f54f2523
parent 63dd9d2f550983d890ea21eee9b8f8619608bb79
author Robert Greenwalt <rgreenwalt@google.com> 1382404142 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382404142 -0700

am 63dd9d2f: am 4802c6da: am 4d8a8392: Merge "Don\'t set same country code on supplicant again and again" into klp-dev

* commit '63dd9d2f550983d890ea21eee9b8f8619608bb79':
  Don't set same country code on supplicant again and again