tree efa716f407dff373f1121c5e80c750c65ae5d523
parent b3e16bcd8fbe5940c96ecbbe189153ca98fe47a8
parent 71aeb798154a515d5f4a91ecb9adb0896ab9a9e6
author Elliott Hughes <enh@google.com> 1430334547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430334547 +0000

am 71aeb798: Move __adb_error to std::string, and improve various errors.

* commit '71aeb798154a515d5f4a91ecb9adb0896ab9a9e6':
  Move __adb_error to std::string, and improve various errors.