commit | da4e4e8f91873e862d0224ee9dde9a4285a35168 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Thu Jun 15 10:58:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 15 10:58:12 2017 +0000 |
tree | 704b87e36e3cde8a20875fc22bf2bc33ae32ff66 | |
parent | e9045366bf9485675b292fa6605cce5230cf0730 [diff] | |
parent | 8411065453824e19d12568684805fed35c3f782f [diff] |
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev am: ed1519d095 -s ours am: 8411065453 -s ours Change-Id: I3e695c75e3e06f0bd70568b462f0ba9cf307384c