Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: 3937646 automerge: 786deba

automerge: c91a880

* commit 'c91a880e015cf545367c109412fd1fe8cf9eb60d':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
This commit is contained in:
Lorenzo Colitti
2015-01-30 15:58:39 +00:00
committed by android-build-merger

Diff Content Not Available