| commit | 48216c2807c0fd5561a592b2be09dad3cc0a0bd7 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Sat Apr 23 06:07:51 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Apr 23 06:07:51 2016 +0000 |
| tree | 877f78365ca02d13a8672dce65399f4855b69f8c | |
| parent | 936375b6f25a328a06d5b783f6fde63afb13d681 [diff] | |
| parent | 445510937841b477cfec56a0634172e4e003c72d [diff] |
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev