commit | 2bfd0e11924a1bfd768e300b7c2965ca81c4e8f1 | [log] [tgz] |
---|---|---|
author | Owain Davies <otjdavies@google.com> | Sat Apr 23 06:13:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 23 06:13:44 2016 +0000 |
tree | 4056d81567e89cf502c3159a152aff96191d503e | |
parent | 8bdae2314764ab049265aa531bec838ce90d13f5 [diff] | |
parent | 936375b6f25a328a06d5b783f6fde63afb13d681 [diff] |
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b * commit '936375b6f25a328a06d5b783f6fde63afb13d681': Added assertion message to testDns failures Change-Id: I9a56dfe2d0960898b61f26ccee3607c7558034de