tree 8413d33e74901d2960a7f5f7e6232a8791b13588
parent 50d24b9ce5352514fe68621c1c18edcbd3be947d
parent 39b6c7fcfecbc226cda1c8f132a61cae78ca82be
author Tianjie Xu <xunchang@google.com> 1517350403 +0000
committer android-build-merger <android-build-merger@google.com> 1517350403 +0000

Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d am: 20af3722d8
am: 39b6c7fcfe

Change-Id: I9545b574641fb0a9eef83142cb99a71c3ddd8902