tree 4e2857aff4396ae971c7fe924e49372b7602ae41
parent fff3d3c3e4db8b6164380e6a2e54f57b30444174
parent 16ff62f309a29bce3cb9cc8ab4fdb1e30384aaa6
author Dmitry Shmidt <dimitrysh@google.com> 1252524319 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252524319 -0700

am 16ff62f3: Remove comments from wpa_supplciant.conf template

Merge commit '16ff62f309a29bce3cb9cc8ab4fdb1e30384aaa6' into eclair-plus-aosp

* commit '16ff62f309a29bce3cb9cc8ab4fdb1e30384aaa6':
  Remove comments from wpa_supplciant.conf template