| commit | 17100fbdaaba8847740433c7efae489295488ad6 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:13:59 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:13:59 2019 -0700 |
| tree | 167ad91fe8569942d3682c1db6b1317ffef424ee | |
| parent | 6e8980ff083669f69d2341b226c14f4ba117619b [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 dd32bb52f7 is in history Change-Id: I6d31b4d1c94057cf0ad1904374841a71e2042f24