tree 877f78365ca02d13a8672dce65399f4855b69f8c
parent 4699aa522a29d0e0191f0cb6eb531ccc0d346a67
parent a6aa5bce79af1d1294ff815a396f1764fc703a27
author Marcus Nascimento <marcusn@google.com> 1463680493 +0000
committer android-build-merger <android-build-merger@google.com> 1463680493 +0000

Merge "Merge "Add assertion messages to testStartUsingNetworkFeature_enableHipri." into lollipop-mr1-cts-dev am: 92849de21f  -s ours" into marshmallow-cts-dev
am: a6aa5bce79

* commit 'a6aa5bce79af1d1294ff815a396f1764fc703a27':
  Add assertion messages to testStartUsingNetworkFeature_enableHipri.

Change-Id: Ib12541988e1c5154fd5343d8fec9e6628239238a