From: Erik Kline <ek@google.com>
Date: Tue, 6 Jun 2017 04:54:04 +0000 (+0000)
Subject: Merge "Support setting upstream parameters."
X-Git-Tag: android-x86-9.0-r1~1029^2^2~199^2~76
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e5024131ba9ec05f929c60ea683ef555e872990;p=android-x86%2Fframeworks-base.git

Merge "Support setting upstream parameters."
am: faf8d67749

Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
---

4e5024131ba9ec05f929c60ea683ef555e872990