[automerger skipped] Merge "Set transport types to resolver" am: d275ec139a am: c368e9352b -s ours
am skip reason: Change-Id I03fc5c62dfd9a51a78a720860531df282fdecc20 with SHA-1 82682799d7 is in history
Change-Id: I9a13896d00c28868584fcc18b0f7f6f11ba0f398
This commit is contained in: