| commit | ec3b1d2c1b0c8350bae82804766bf8db1cd69516 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:43 2021 +0000 |
| tree | 3d64675ee697db52e2e95ccbfeab956f9ca43c88 | |
| parent | a995a52802ae884cf71a9cc836e93a8b2f904b6f [diff] | |
| parent | 0af6d89bcc6668e1ff7d969c9d2e7f59ac0912f8 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4bb423b12c -s ours am: 0af6d89bcc -s ours am skip reason: Merged-In I448a17be0704a5f537984335e341a993d2190196 with SHA-1 a995a52802 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libziparchive/+/15572062 Change-Id: I5e829a7a732a0ff6385515a37e05fbad38fda24f