| commit | 01d88f0013edfd78262febe6630887e934d0726e | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 14:17:38 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 14:17:38 2019 -0700 |
| tree | edecc03c894f40f85447263086c967c243fcfd9a | |
| parent | 9b101c6b5c91f4b57fa9566305b4177c62e7ca2f [diff] | |
| parent | a28c13df9e5a144a0f90ea935024fb8979deac3a [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: ad4335d5c5 -s ours am: 89ef28e265 -s ours am: a28c13df9e -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 affe82b1a8 is in history Change-Id: I4b51a0ab8f2f19bcc4e42101be0c50616b3e2b9e