| commit | 8eb1fbf1bca71b94f6c5c8b8b4294942fb1792ee | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Wed Feb 15 00:54:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 15 00:54:07 2017 +0000 |
| tree | 1bdba10dcb997d6986a8ca25dc96280813d9a208 | |
| parent | 23d077318c96b8c44006b9df53c4d7c0bd758bb0 [diff] | |
| parent | f6d55d7e9eba36fb3fb9948b1dc93dc0b9f13f82 [diff] |
Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 am: f6d55d7e9e Change-Id: Ibd6b1fae52ec31ae488484be727b5261820e6ecb