| commit | c519b8042f08a07449a3861c791afe12619b28a0 | [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 | 934c8294e459e98553b6918ffef2f73d1e54d0b8 | |
| parent | 50d23adfe26bf0cf9a34138efc299eaec04127e9 [diff] | |
| parent | b6088a80b4c3309cd18f5eb46ecf0614af8339ec [diff] |
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d automerge: 786deba automerge: b6088a8 * commit 'b6088a80b4c3309cd18f5eb46ecf0614af8339ec': Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()