| commit | 19ae160653a81992cb14b4760e1663dec8a54b2b | [log] [tgz] |
|---|---|---|
| author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 16:12:20 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 16:12:20 2019 -0700 |
| tree | a16eee41776247d858eb52db4f37f00c1c81b8d0 | |
| parent | 4e95f73af9c8f120868e40bc012baa433c76805d [diff] | |
| parent | 7ac21f4f1d21c5494d2297fcea4d2a08b76013ad [diff] |
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: 7ac21f4f1d Change-Id: I9cb2098d1bd8538a26ff1dcba10534c63a405baa