tree d16a1af75641b9bf3c8a8e17d881e677ccf752dc
parent ebadeeabcfeb6c1ece8da62f53ecd8f884e32cee
parent 05e07c20e3c861d0f189e12b850a831a45ded01e
author Nick Kralevich <nnk@google.com> 1394156146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394156146 +0000

am 05e07c20: Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file."

* commit '05e07c20e3c861d0f189e12b850a831a45ded01e':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.