| commit | 6705fff9791d478c41dff37d9e5f525269aa2f1a | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 16:56:45 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 16:56:45 2019 -0700 |
| tree | cadfe1854e40d4818933ad49ca62a6fbaa3ab285 | |
| parent | 48516f991bc575294e019f28ae19469a09014c58 [diff] | |
| parent | 2720cfb7ad60ccb47bb8bdfde64046816adc21b5 [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: 2720cfb7ad -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: If7724529b04189ff8271835457de48694bd8b780