tree 417bae67a42fa6304478f10bbfb62f650a2eb6a9
parent 63445824d698cddf788b5a4de5627f319f501e87
parent 14f7faf78e048b7209551cc32ac50b2673e15409
author Erik Kline <ek@google.com> 1487119130 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1487119130 +0000

Merge "Split chooseUpstreamType() into two separate functions"