| commit | bac14852ef54d17bbef04f1eb2cc03a540fee0a1 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Jan 30 15:54:45 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 30 15:54:45 2015 +0000 |
| tree | 9a1774d19c3d6051fb0bbe4264e70a6a09e95862 | |
| parent | 4137d5fd3ec8bd1dfb898fd92307db81c3648b3c [diff] | |
| parent | c0e636aae73da48f301b34e673c1fe73fdae5ff4 [diff] |
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: c0e636a automerge: 786deba * commit '786deba636618fcf530e42340b0e5d683c5af74c': Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()