| commit | 0147e6e93bd365ebc79c816163c9f5fc7a5aa52b | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 16:21:22 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 16:21:22 2019 -0700 |
| tree | 46b2bce636a4cb7fb5747847fed40eefccba5169 | |
| parent | 6006f887bfcb385f0c0768a3ceaf1e3a0f62b7d6 [diff] | |
| parent | 55b6080424dc84549ea4be5fa617792b9b8bceec [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: 63dda3513d -s ours am: 335491989f -s ours am: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours am: 55b6080424 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: I0f142075b03f98507bf1711238f9ba79d5f2ae5e