| commit | b3c63b6961fe894a0d7d7def2c2c68a021861ec6 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 14:17:38 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 14:17:38 2019 -0700 |
| tree | 51cf27311927d936e6942300355659edc79b1ebc | |
| parent | ddb681cafe8a89cceb97b8f740ae8a3eebe666c1 [diff] | |
| parent | 4f182df10aa3e60dfe8efa0ef4ebb9edddcbe0ec [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I4b51a0ab8f2f19bcc4e42101be0c50616b3e2b9e