| commit | 5be8f142589e776a14574437c5b3b2390cc079bb | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:55:38 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:55:38 2019 -0700 |
| tree | 1f2e1f87243fe4c5a5cec3b1de558edee7c14a03 | |
| parent | a2fd68d0ba669a7e08cd861b56657e39794bf24d [diff] | |
| parent | 8a4065394b7f0d794a09466b373d2a0303221d9f [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: If9025a516481d56021235bf579c30ca2b979d379