commit | 83c0e14c0b152033296a1f469a6968db2c946452 | [log] [tgz] |
---|---|---|
author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 16:49:10 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 16:49:10 2019 -0700 |
tree | 1a7873c689cee6fc02fedbee9fa074b50f78e707 | |
parent | a7fc792b84d0711333132617754143765b52cc1e [diff] | |
parent | 19ae160653a81992cb14b4760e1663dec8a54b2b [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 am: 19ae160653 -s ours am skip reason: subject contains skip directive Change-Id: I0d74bcaa2bc7dc5723b32df29859ffd644ff8abf