tree d9adacdbd7221ec66d483c538c093b014fa19005
parent 30e144f32477cf3aaf9063b8f63bab9cc31621b7
parent 30f94813e7f35e3812c5d31ebc53630c26c4e4b2
author Dmitry Shmidt <dimitrysh@google.com> 1329938646 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1329938646 -0800

Merge changes If51126b8,I05322cf0

* changes:
  wpa_supplicant: Change wpa_supplicant.conf template name
  Move .config for Android to android.config