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

automerge: 786deba

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

Diff Content Not Available