| commit | 42c7ff127ed618bf71f58a201700c9ded918d7d8 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Jan 30 15:58:39 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 30 15:58:39 2015 +0000 |
| tree | 05c589571a7e445215ce4c7c40f0ccb5e0a666cd | |
| parent | a8a5ea3416d006a69e634fd3a10978889cb3d76f [diff] | |
| parent | bac14852ef54d17bbef04f1eb2cc03a540fee0a1 [diff] |
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: c0e636a automerge: 786deba automerge: bac1485 * commit 'bac14852ef54d17bbef04f1eb2cc03a540fee0a1': Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()