| commit | ec58302ecef1366dd32db2ed18d030da016ffe3e | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 13:32:01 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 13:32:01 2019 -0700 |
| tree | cadfe1854e40d4818933ad49ca62a6fbaa3ab285 | |
| parent | a9522fcc78050971f57b99f145d160b95ba1a36d [diff] | |
| parent | 5be8f142589e776a14574437c5b3b2390cc079bb [diff] |
Merge "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: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: I40a141c7e295fea0245f77739d756818d9970d3a