tree ab7a7b81cce7d5fa86f075d2013e69439eec40bf
parent b3eeb817ab2a5dd76cbe12053b37e853a3fce682
parent 18bb9a4f261ddacf7efae1bcb41039db1c82f443
author Tianjie Xu <xunchang@google.com> 1493833421 +0000
committer android-build-merger <android-build-merger@google.com> 1493833421 +0000

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

Change-Id: I0614c33388d68a45d443de8058c2ee36e896c583