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)
am: ed1519d095  -s ours

Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e


Trivial merge