| commit | da646b71ee65f5b96b61365179377c75a2cb3741 | [log] [tgz] |
|---|---|---|
| author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 15:59:53 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 15:59:53 2019 -0700 |
| tree | a16eee41776247d858eb52db4f37f00c1c81b8d0 | |
| parent | 05a81516760bd35663a15f9da125914a42f4df32 [diff] | |
| parent | baed35fda0c6b028f9857f911dc04a5a47618ef8 [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 skip reason: subject contains skip directive Change-Id: I297d19f37819dd47be9e64dd9b2a0e2e07c72e95