| commit | 3bcaeafe943411543f051b8142b62ffe45589356 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:19:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:19:51 2023 +0000 |
| tree | 77ec2740277e4361522175b4f04e0a1d118c0e74 | |
| parent | 9003f0419ba0b95fd3bf54d3ac07e558fc4eabc4 [diff] | |
| parent | e516e161bcf48403722c6cafe0e8b5f423cec0c4 [diff] |
[automerger skipped] Merge Android 14 am: fed6e9e6af -s ours am: 4e09643ff6 -s ours am: 75163619af -s ours am: 7ecec7d5ee -s ours am: e516e161bc -s ours am skip reason: Merged-In Ib770843dc619faa2df50f0fef3ffa3d969ce4558 with SHA-1 ce296edb61 is already in history Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2775080 Change-Id: I4707edce53366eab924300f063614e6855b675d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>