| commit | c403c812184518d391cfc8a986fd304d640e2fb3 | [log] [tgz] |
|---|---|---|
| author | Owain Davies <otjdavies@google.com> | Mon Apr 25 23:48:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 25 23:48:09 2016 +0000 |
| tree | d4f38b7d30532d031b896b5126fa2d4073bfcf5e | |
| parent | 6d3841c6a577d23fc4be40b7b6cdd57074ebb589 [diff] | |
| parent | 03995235ba9f4344f752400dcce481f09a04c3cc [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 * commit 'fd3f832fcfb9dc4fa3e4d497a97ebdf1636269b2': Add assertion message if testDns ipv6 lookup reutrns ipv4. Change-Id: I774f8188a4329508bd590564859f38b3ec049f7c