| commit | 275a0e6237faa6d842fbd08997b92756997b2f2b | [log] [tgz] |
|---|---|---|
| author | Owain Davies <otjdavies@google.com> | Sat Apr 23 06:13:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Apr 23 06:13:45 2016 +0000 |
| tree | 877f78365ca02d13a8672dce65399f4855b69f8c | |
| parent | 2bfd0e11924a1bfd768e300b7c2965ca81c4e8f1 [diff] | |
| parent | 48216c2807c0fd5561a592b2be09dad3cc0a0bd7 [diff] |
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev am: 48216c2 * commit '48216c2807c0fd5561a592b2be09dad3cc0a0bd7': Add assertion message if testDns ipv6 lookup reutrns ipv4. Change-Id: I361b96fa073ffe1d7719be745e32241322b1eeed