| commit | b5c8af70e8011a93dab05f4a4276e63981601e3f | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:40:46 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:40:46 2019 -0700 |
| tree | 40f6fd356a5972775ed636aae834e4ba4b9aa59a | |
| parent | de905bf585177a830cc44583c5e5598b864bd1d9 [diff] | |
| parent | 17100fbdaaba8847740433c7efae489295488ad6 [diff] |
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 17100fbdaa -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: I595f51bfba8a379a2a9afff77292ad361a65d480