commit | f51d562627aa799b7222efcf07c61e301dfa22be | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Wed Feb 15 01:04:44 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 15 01:04:44 2017 +0000 |
tree | aaf0d003d4888c664c6f0dfaed1f6687700726ce | |
parent | 0f5cf47489acce307cc5c802ad479a7d141aff58 [diff] | |
parent | 8eb1fbf1bca71b94f6c5c8b8b4294942fb1792ee [diff] |
Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 am: f6d55d7e9e am: 8eb1fbf1bc Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f