tree 46b62c20408fe2498c2a7bd6520bdb2b4f466685
parent 586377d1f3f0fa3c03664b702affbbf4ea0c3a9e
parent 7a1c2943ab9c1d695641c274e83daf944bf4ade1
author Tianjie Xu <xunchang@google.com> 1493833572 +0000
committer android-build-merger <android-build-merger@google.com> 1493833572 +0000

Merge "Add a default error code when updater script aborts" am: 89394632b1 am: 18bb9a4f26
am: 7a1c2943ab

Change-Id: I56207a2e987ee09e05270b0249b5f579f1710d11