tree a5ea5b85bbfb96dfa8d2c1eeab79b9b34a3a1e1b
parent 7b795abd13ba11280920c6b39174d2b02b014970
parent 639fce1c4d8783dc7d144e49afc3169fd2645453
author Tianjie Xu <xunchang@google.com> 1503615104 +0000
committer android-build-merger <android-build-merger@google.com> 1503615104 +0000

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

Change-Id: I089173b6b1a71d72c20d2564a8982c9a7f8c37c3