tree afdba7ef17a6a27394dc1917664cdcdcf34dde42
parent 400436b97310b64da3e00a208c26b2b32e7f8af1
parent c07f65727c2f086d4cce82f079d7472347440187
author Brad Ebinger <breadley@google.com> 1528759483 -0700
committer android-build-merger <android-build-merger@google.com> 1528759483 -0700

[automerger skipped] Merge "Correctly Destroy a Connection when there is an Error" am: d089f39f9d  -s ours
am: c07f65727c  -s ours

Change-Id: Ic324c9f94bb052f894433f89a1803ff9fac0cb22