commit | acedea85cf9918ad904ee3a05f4af29fb8d4ac8f | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Thu Jun 27 14:00:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 27 14:00:27 2019 -0700 |
tree | b8a9d9de8145726a17b5fa41a31c6be327d52347 | |
parent | db8e7becc3b88bceee95eea4770cca0cc5a084b7 [diff] | |
parent | f11c87d460436b5af6fb5a6015c8c61a24e25db1 [diff] |
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: b8b8d703d9 -s ours am: f090f3de05 -s ours am: 70808176ce -s ours am: 107b7aadfd -s ours am: f11c87d460 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history Change-Id: I9189f29db749b171c19ecf2e8c68be8209205c9f