| commit | 25c301c8a3fe23ae0d0e1e6862c1182f293ccbab | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jul 15 09:01:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 15 09:01:50 2021 +0000 |
| tree | ec31414159880b22cdecd54b7da37c7b9e1a6b0c | |
| parent | 941b1a61b0993a033bdcf10208ee8a909e08230e [diff] | |
| parent | b0b9d35d2ade752e8607498d9d1c0f178ded552e [diff] |
Merge "libsnapshot: Fix inconsistency in how merge ops are counted." am: 16aa3c9573 am: b0b9d35d2a Original change: https://android-review.googlesource.com/c/platform/system/core/+/1767246 Change-Id: Iefb3c946a6ef3b54357e1aadddbe3627f9ffdf11