commit | f6d55d7e9eba36fb3fb9948b1dc93dc0b9f13f82 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Wed Feb 15 00:49:20 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 15 00:49:20 2017 +0000 |
tree | de63282e735b7694c5295b9f8cf1e2596e499d34 | |
parent | 46507625573cb63a66b82b0fe17e9284e84aafc6 [diff] | |
parent | 7a42d3ad83cbb3e7f98964eb876b8b21bd46816a [diff] |
Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642