tree 22dd3567f8972475bf2316f49ba29a61a97c8a71
parent a44404154730e54615d44c389b11cec9dd86c001
parent bab2ba3e730d610883added31ff806da352cbb07
author Elliott Hughes <enh@google.com> 1357590381 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357590381 -0800

am bab2ba3e: am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set"

* commit 'bab2ba3e730d610883added31ff806da352cbb07':
  Fix dhcpcd startup when net.hostname is not set