am be2dfb68: am f773d127: resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aosp

* commit 'be2dfb684caf760937bae61b79c7dfe390be04d0':
  Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
This commit is contained in:
Nick Kralevich 2014-03-04 19:58:58 +00:00 committed by Android Git Automerger
commit da56648374

Diff content is not available