OSDN Git Service

Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"...
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Jan 2015 15:54:45 +0000 (15:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jan 2015 15:54:45 +0000 (15:54 +0000)
commitb6088a80b4c3309cd18f5eb46ecf0614af8339ec
tree4a3454531ca186e6296aef38b1f9865d6bc9a7bc
parentc89cdf2ad435b3b5da16405a0eceb600e93b7a3e
parent786deba636618fcf530e42340b0e5d683c5af74c
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d
automerge: 786deba

* commit '786deba636618fcf530e42340b0e5d683c5af74c':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()