commit | 6829652e87b94002b19c482976c5928abff793da | [log] [tgz] |
---|---|---|
author | Marcus Nascimento <marcusn@google.com> | Thu May 19 18:26:21 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 19 18:26:21 2016 +0000 |
tree | d63ad26cd2780f8840c4e2847538d827c74e7a72 | |
parent | 999a4fef2d3e08d077e230cff7f042e40477696d [diff] | |
parent | b232cf2d49c66291e203d63b05cc0921170f42c2 [diff] |
Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f -s ours" into marshmallow-cts-dev am: a6aa5bce79 am: 9ef251d523 am: 1ad52d8800 am: 01c938ccb7 am: 64f19d0319 am: b232cf2d49 * commit 'b232cf2d49c66291e203d63b05cc0921170f42c2': Add assertion messages to testStartUsingNetworkFeature_enableHipri. Change-Id: I48999b9bc410228a67a52f4fedf85e613b2d3ebf