commit | e2718986d18253e4d08c0974e099285b61030892 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Wed Aug 28 19:06:08 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 19:06:08 2019 -0700 |
tree | f8229f09a6dcfa807dc05fd52e4fbd1951d1dabb | |
parent | 78697c3b3b3624c45c9fc17810da0bdbdf2dc126 [diff] | |
parent | 781ab3fbdfa89186c344a0147c9fdecd120568dc [diff] |
Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours am: 7526bf0f92 -s ours am: 781ab3fbdf -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: Ia4fef6d05a072b94d24e7151f39b68b4f8974d09