| commit | 9d6bb2d8c14fc9e0cd03c533ae71c13893b10d29 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 13:47:15 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 13:47:15 2019 -0700 |
| tree | 4ca1b50e4c44e76c590b41a8515d7cc8d006a743 | |
| parent | 1c57f17275428992999a9eb72975d365dfd7a8e5 [diff] | |
| parent | ec58302ecef1366dd32db2ed18d030da016ffe3e [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: ec58302ece -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: I5278cbfbd182e1f86adf808d4a7774bd4348e77b