Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev am: af988f0d74 -s ours am: 8e3bef2416 -s ours am: baed35fda0 -s ours am: da646b71ee -s ours

Browse Source

am: e7ae8c5c48 -s ours
am skip reason: subject contains skip directive

Change-Id: I0f5dd20baf05bad8eabb37a187ca1b48f3c2cab4

...

This commit is contained in:

Brio Automation

2019-03-29 17:31:31 -07:00

committed by android-build-merger

parent 83c0e14c0b e7ae8c5c48

commit 93dca81d5f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available