tree 0f46a675aa21446e99a20099de2d4eaeae35e7b1
parent d2ecee2506d50433e76f406d1fe44eaea6aa2a2f
parent a1d368af2f01e2048240fb730f6cc399fc1cc1ab
author Treehugger Robot <treehugger-gerrit@google.com> 1496923379 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1496923382 +0000

Merge "Move findPreferredUpstreamType into UNM"