| commit | 6d3841c6a577d23fc4be40b7b6cdd57074ebb589 | [log] [tgz] |
|---|---|---|
| author | Owain Davies <otjdavies@google.com> | Mon Apr 25 23:48:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 25 23:48:07 2016 +0000 |
| tree | 22f4bd97e46a40443dedd526d2da328c5bd16ec9 | |
| parent | bac071b74f0a0a7c20db21cc30c7b21b432eb948 [diff] | |
| parent | 39cb9a5a5c991a6bee0d65301163e612854d6a93 [diff] |
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev am: 936375b am: 2bfd0e1 am: 2a0f366 am: 39cb9a5 am: 7cde9a8 * commit '7cde9a81f8ee813b47dd424cea85692fd6f794fb': Added assertion message to testDns failures Change-Id: Icef1c18274c8ae3883b718d823f851d4c1562417