tree 0fdd7de6e308139e9033dadec1a335f27ab0e5a3
parent fd4714436374e06d062b52fbb24fa0cdcae1931c
parent b482401a8a6da8c1b82d7b29d5474117d16697a0
author Alex Deymo <deymo@google.com> 1487031882 +0000
committer android-build-merger <android-build-merger@google.com> 1487031882 +0000

Fix terminating a transfer while resolving proxies. am: 71f6762c7e am: a7d55efc9b
am: b482401a8a

Change-Id: I0481f89d25bd06cdcab50f24122e3b7a2139afc3