tree b6c90d7bb42029bf17a915f9aecd8f22c443fe95
parent d8cabd7834d0b5919261e59da4de57a6644a9ad1
parent 3e7b0f55ee790ba679ee12a89a3a6d7dc58bc470
author dimitry <dimitry@google.com> 1545242389 -0800
committer android-build-merger <android-build-merger@google.com> 1545242389 -0800

Merge "Slightly improve error handling" am: a87126ad77
am: 3e7b0f55ee

Change-Id: Ibfcf7126ee48d288a453c5a06742734bb5157a45