tree d19189f1aed7694e092a8ba3fc39b9aa1181f16d
parent 1f086c646a937223cb642fdea2a7e719ce0e090a
parent f868d0f091321153cb92fe11f7942baec35fd700
author TreeHugger Robot <treehugger-gerrit@google.com> 1599103783 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599103783 +0000

[automerger skipped] Merge "Specify CAPABILITY_INTERNET for ConnDiags CTS test." into stage-aosp-rvc-ts-dev am: f1383c3543 am: 8c00266fb6 -s ours am: f868d0f091 -s ours

am skip reason: Change-Id Ia32ac00f949a2ee9319c80c25f294bfa834ad0f9 with SHA-1 ed2521af1e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12501101

Change-Id: I84f3e10469184827b4f9ad5f91ee895bd80e50ee