| commit | 7526bf0f92b21164d62fec2eb6e00d74415b0a1e | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Wed Aug 28 17:33:23 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 17:33:23 2019 -0700 |
| tree | 46b2bce636a4cb7fb5747847fed40eefccba5169 | |
| parent | 0cb9eae765a6de1d45e854a3be9d4067ae37bb39 [diff] | |
| parent | f2e813063596d299240583a86e542f69dc0acf5f [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: f2e8130635 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: Ie2500561329bba3cab6b6bab5851d080b0170b97