| commit | 7ecec7d5ee21f2c6f67afe2583b792ba835df57e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:50:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:50:29 2023 +0000 |
| tree | 77ec2740277e4361522175b4f04e0a1d118c0e74 | |
| parent | ea442f1487ebc34beb3d4d210c9fafcfc1bffeab [diff] | |
| parent | 75163619aff6226f3b1ffa71c7a2d58b9db1ac53 [diff] |
[automerger skipped] Merge Android 14 am: fed6e9e6af -s ours am: 4e09643ff6 -s ours am: 75163619af -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: I00e389d5418e602f26e4be292824d2b2f8ea9d0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>