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

automerge: bac1485

* commit 'bac14852ef54d17bbef04f1eb2cc03a540fee0a1':
  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