tree 60ad850225db8209caf36af204a299c08e513ad8
parent 2cb58deb7b906f984efadb3ed7ac9dee246323a4
parent faf8d67749af7993cd574d6baa67ba214ab24aa7
author Erik Kline <ek@google.com> 1496724844 +0000
committer android-build-merger <android-build-merger@google.com> 1496724844 +0000

Merge "Support setting upstream parameters."
am: faf8d67749

Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97