| commit | c7e558b100057fae2ed799e80ce7474753ab4980 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:07:31 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:07:31 2019 -0700 |
| tree | da5e3fde543585c67e77add1819e460771190b53 | |
| parent | 956b28af133c4ee4ee1674250083631bcbc812d8 [diff] | |
| parent | 335491989f71dc8d9cbead550937eb0fae46891a [diff] |
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history Change-Id: I99b533a6db29b6568b487cda80ba2f7fd5a1a6ac