tree 2d6829279e11534bf856385214a88103216204c6
parent 2a248f6c606887d24fec3cdb8ed2831566ad0320
parent 0d67f5f8b96539bf88468a980c091513f3236ce3
author Elliott Hughes <enh@google.com> 1533629962 -0700
committer android-build-merger <android-build-merger@google.com> 1533629962 -0700

Improve error handling. am: 1c3a4f469f am: 26ec9bd81e am: 4d49d279eb
am: 0d67f5f8b9

Change-Id: I2f75b467bce834c6bcda829cdf1d26c6ee5f999f