| commit | 66d03ca8c698128498169a9c1ce6fac90ebf8caa | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Nov 05 20:15:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 20:15:46 2014 +0000 |
| tree | 6f02c8211874bee7cb7ecdfb120ac046fc427655 | |
| parent | a026f47494eb43bb792dc6f0477117b7e85f0c6e [diff] | |
| parent | a21622df7e1368e7321059a5f5047d2011fd71e5 [diff] |
am a21622df: am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev automerge: 6ad91cb * commit 'a21622df7e1368e7321059a5f5047d2011fd71e5': Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()