tree 2da1b6952d20a01a3cf5d4b4ced1faeda202576a
parent 7379a5290dd96e9382232c1be625e5a3431f05b0
parent 736be2f93e7739b1e07d6466f9f37e8c391824ad
author Tianjie Xu <xunchang@google.com> 1503613690 +0000
committer android-build-merger <android-build-merger@google.com> 1503613690 +0000

Merge "Add missing report of error code under recovery" am: 571855b0e6
am: 736be2f93e

Change-Id: Ia2be72d6efac6be06178640c3b6ab716e99c6edf