| commit | 774ed8f2768642c792c0628ba63a0fe30280ee90 | [log] [tgz] |
|---|---|---|
| author | Owain Davies <otjdavies@google.com> | Mon Apr 25 23:50:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 25 23:50:59 2016 +0000 |
| tree | f9a169662b1411fab12a9535ff0f097734475e3b | |
| parent | 6ed611d7823d22330b539761cd3d844a0bd577fd [diff] | |
| parent | c403c812184518d391cfc8a986fd304d640e2fb3 [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 am: 275a0e6 am: 4be27c8 am: 0399523 am: fd3f832 am: c403c81 * commit 'c403c812184518d391cfc8a986fd304d640e2fb3': Add assertion message if testDns ipv6 lookup reutrns ipv4. Change-Id: Idaf9c0536bd63cbaf5e109508e50c6a5d1808ac0