tree 65b11858e41b2a8cc88cd82215d40cca1a8140b0
parent a616f0d4763af7aa9182f1846deb0f959d67b01b
parent 03f740ec3d0a4191e46615e961bd9f6bbf64d63c
author Tianjie Xu <xunchang@google.com> 1493833901 +0000
committer android-build-merger <android-build-merger@google.com> 1493833901 +0000

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

Change-Id: I3927cb4801a5b06467120a5e8c1c112438f86235