| commit | 7ac21f4f1d21c5494d2297fcea4d2a08b76013ad | [log] [tgz] |
|---|---|---|
| author | Brio Automation <brio.automation@gmail.com> | Fri Mar 29 15:32:51 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 29 15:32:51 2019 -0700 |
| tree | 4d4b47cf1aadc3869fc00cb5245515321a37484c | |
| parent | 63bfe51c2d76da962b1bce428618907603c41e10 [diff] | |
| parent | 8e3bef2416ce9be50c22ac1c3eb9ac3d0abf6f5f [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 skip reason: subject contains skip directive Change-Id: Ie2c0ba80b48639562e56fd6fc92944b514a696f1