| commit | 03995235ba9f4344f752400dcce481f09a04c3cc | [log] [tgz] |
|---|---|---|
| author | Owain Davies <otjdavies@google.com> | Sat Apr 23 06:19:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Apr 23 06:19:47 2016 +0000 |
| tree | 5df90b0da4823e170e8cd32d12971730a0eeea98 | |
| parent | 39cb9a5a5c991a6bee0d65301163e612854d6a93 [diff] | |
| parent | 275a0e6237faa6d842fbd08997b92756997b2f2b [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 * commit '4be27c8e8497987720d58494a330484648e72caa': Add assertion message if testDns ipv6 lookup reutrns ipv4. Change-Id: I03a0a86365929a6bdc8eb2815229341eb7a6a311