[automerger skipped] Merge "Set transport types to resolver" am: 3c0c668d87 am: 2b607c81cc -s ours am: 8121588ee3 -s ours am: 7eff156de8 -s ours am: aadc673c47 -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 935dde5458 is in history
Change-Id: I1c7e5b9f91b7fe5fb5c524550a9a608de9f68968
This commit is contained in: