| commit | e91276e7026a2985443daf4675e26726f9af9dc3 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Thu Jul 27 01:18:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 01:18:42 2023 +0000 |
| tree | d8a7144c9165f6900a3b35c78149e9155252a116 | |
| parent | 6fda7578707a0eb49d931e6ce05257c26ec7e7a1 [diff] | |
| parent | f79d4f88e15dbfb476e9596a980d9fc4dd4a8949 [diff] |
Fix merge sequence failure due to XOR conversion am: f79d4f88e1 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2673358 Change-Id: Iba90964e82f12cc9eb14d7fa8d6ab5ef07242135 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>