| commit | 93dca81d5f550a128b84feaace1356e37afbf9f1 | [log] [tgz] |
|---|---|---|
| author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 17:31:31 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 17:31:31 2019 -0700 |
| tree | 1a7873c689cee6fc02fedbee9fa074b50f78e707 | |
| parent | 83c0e14c0b152033296a1f469a6968db2c946452 [diff] | |
| parent | e7ae8c5c48a346528aec82110ea78055aff491e7 [diff] |
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 am: e7ae8c5c48 -s ours am skip reason: subject contains skip directive Change-Id: I0f5dd20baf05bad8eabb37a187ca1b48f3c2cab4