| commit | e7ae8c5c48a346528aec82110ea78055aff491e7 | [log] [tgz] |
|---|---|---|
| author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 16:35:48 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 16:35:48 2019 -0700 |
| tree | a16eee41776247d858eb52db4f37f00c1c81b8d0 | |
| parent | 19ae160653a81992cb14b4760e1663dec8a54b2b [diff] | |
| parent | da646b71ee65f5b96b61365179377c75a2cb3741 [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 skip reason: subject contains skip directive Change-Id: I4e69fd386d7bd80208948560a3fdc2c9e170d26c