OSDN Git Service

Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
authorErik Kline <ek@google.com>
Thu, 15 Jun 2017 10:49:12 +0000 (10:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 10:49:12 +0000 (10:49 +0000)
commit8411065453824e19d12568684805fed35c3f782f
tree6db13116bd7774029036e4b2b756fa823d8762a2
parent2e26c880b21b79a824ebf9d359a8192e046f128f
parented1519d0958bef18b62b24093cec7506237d39de
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
am: ed1519d095  -s ours

Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e