| commit | f2e813063596d299240583a86e542f69dc0acf5f | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Wed Aug 28 15:08:22 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 15:08:22 2019 -0700 |
| tree | 5a96eb316dba8acbcbaeb4b13b3a3b4c9f558dd3 | |
| parent | 10d149e4bc0c3218990adfa8db4f01b5bff61279 [diff] | |
| parent | 8fe93b6bdabafd86ce009db6fe8a3f4726977221 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: I4fad6af42f1e70e940729e6463e762cb197b6483