| commit | eac9714c87f0165a4aca60c80f0cc0c8f829794e | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Wed Aug 28 15:10:41 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 15:10:41 2019 -0700 |
| tree | f42b967b945ddcb9ef86792eb659e6f4592fd214 | |
| parent | 66e765a4eddfbeb84866df836758fdced5bef2d1 [diff] | |
| parent | 9bfe3a6b5f5e36478921d0fa0ebba78c3df39af8 [diff] |
Merge "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: ad4335d5c5 -s ours am: 89ef28e265 -s ours am: a28c13df9e -s ours am: c10e37682b -s ours am: 9bfe3a6b5f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 59c4148eca is in history Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b