| commit | cfa9c5b495da831fd9badf10a92e26b6e95ba1d8 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Wed Feb 15 01:11:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 15 01:11:30 2017 +0000 |
| tree | efe5539ddfb80fa042cb3f796bd6b0a948f31900 | |
| parent | aada49a3972b65354beb5153e440ad4465552c72 [diff] | |
| parent | f51d562627aa799b7222efcf07c61e301dfa22be [diff] |
Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 am: f6d55d7e9e am: 8eb1fbf1bc am: f51d562627 Change-Id: Id2e6f20d79f088d27593953ec39112a84a8ba5f0