commit | 0948ef4fa96088831877d3d28d38bf9672ecc2c0 | [log] [tgz] |
---|---|---|
author | Krzysztof KosiĆski <krzysio@google.com> | Mon Mar 18 17:52:20 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 18 17:52:20 2024 +0000 |
tree | 6fd79893327806ac765b43fdde598daa77151903 | |
parent | 127e9246cc34e13a7d01a6c9e2eacff4c143b680 [diff] | |
parent | 68d41126d5bb7931a5753da7effbf1d6f7482863 [diff] |
Merge "Fix incompatibilities with Protobuf 22.x." into main am: 68d41126d5 Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3004513 Change-Id: I4d443838f0be75a06a72b8b4dd844ed36b5a9923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>