| commit | e6e8603ce4b2bf285cda8aadc907ae7c6619ef93 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 15:51:47 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:51:47 2019 -0700 |
| tree | d70894cf3fe563b1e62154f42078e2fe2bcb16f5 | |
| parent | ddce521efa1712f8d0c8502bd67784d2731a7689 [diff] | |
| parent | c34765400303a5ff55eb24418c68f2ced599b214 [diff] |
Merge "Merge "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: 4f182df10a -s ours am: c347654003 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I4ebcb8b4ab7ac188f4d467af54f6babd4f3682c5