[automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours am: 8121588ee3 -s ours am: 7eff156de8 -s ours

Browse Source

am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history

Change-Id: I87995328b2979c551cae0107766939ba6b53cf3d

...

This commit is contained in:

Lorenzo Colitti

2020-04-13 08:41:18 +00:00

committed by Automerger Merge Worker

parent 8a78ecf2cf 7eff156de8

commit aadc673c47

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available