tree 88a7f57c8af264b9bdac6b64af35bd978bad228c
parent 8884aac68d50777be8aed8d107bc09c5f46f1000
parent c408601c24b419f7c63b67d256ea3050cbc46bcc
author Daniel Xie <dxie@google.com> 1461391343 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461391343 +0000

Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev