diff options
author | David Anderson <dvander@google.com> | 2021-04-20 17:11:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 17:11:24 +0000 |
commit | cb1d0fbc376268a15566d926d2bd7ad7c82d7117 (patch) | |
tree | e95e1a9ccdb53c2ba6352a45a3508a124bb8b86a /trusty/coverage/coverage_test.cpp | |
parent | fe2baa7c72e25662f440f03fc7cfdbcf6a280e10 (diff) | |
parent | 161320e2c4bfbf2f9ccc3d7ccca8bb3831e0d9a3 (diff) |
Merge "libsnapshot: Add a merge failure code to the update state." am: 53a06bffe1 am: 161320e2c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673808
Change-Id: I841a1266c880fa176b8e6372d34f4523592ea8b8
Diffstat (limited to 'trusty/coverage/coverage_test.cpp')
0 files changed, 0 insertions, 0 deletions