OSDN Git Service

am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkPrope...
authorPaul Jensen <pauljensen@google.com>
Wed, 5 Nov 2014 19:11:32 +0000 (19:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Nov 2014 19:11:32 +0000 (19:11 +0000)
commit6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75
treeae4b907e9a5ea0d002cb65850677e23669b69f2f
parent125fb86ee0cc0e49d6847bed7a76829ad87c1312
parent021a95f761e1bc26cc215a9daedb04af818002f5
am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev

* commit '021a95f761e1bc26cc215a9daedb04af818002f5':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()