tree ae198dd33b8083d90f1692562bd9f917a4f051b7
parent 270886043aebe5b8b1d2021dca1149eb1ad874ee
parent 38ed0537be7341222df518467642ec5f658d19ca
author Elliott Hughes <enh@google.com> 1492649449 +0000
committer android-build-merger <android-build-merger@google.com> 1492649449 +0000

Merge "Fix various adb error reporting bugs." am: 8dead17a58 am: e6b808ea5b
am: 38ed0537be

Change-Id: If105ed25a561ef745849b3c76905101a2e2001d5