commit | 8fe93b6bdabafd86ce009db6fe8a3f4726977221 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Wed Aug 28 14:24:50 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 14:24:50 2019 -0700 |
tree | b252a1d2206d3e2a713644b98805a45f265ce103 | |
parent | 07e500dd0076dfd8aaff3704a2ba05b8a2bc7ad7 [diff] | |
parent | ddce521efa1712f8d0c8502bd67784d2731a7689 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: I4fb6aa5ec81287040bba2c213a5f06024bd6eddf