| commit | 51428b62b966ef0e0a2625c15e246cde69de8f13 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Tue Jun 01 22:37:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 01 22:37:27 2021 +0000 |
| tree | faf3480f70067aba0dbb8542dd753197dd4f6d81 | |
| parent | 11202d9771d7ea06d3843d9fd97d313db5122dbe [diff] | |
| parent | 28e46893d0f354f845706bfc4f66c2bad38b1f42 [diff] |
Retain merge failure codes if merge succeeds. am: 28e46893d0 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1716269 Change-Id: I2f86c68fd691b03470e14b9e0b95026e04ef267e