commit | 304fe339c6a4144bbc960d1612a02526caed8662 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Wed Feb 21 18:47:06 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 21 18:47:06 2024 +0000 |
tree | ee63fd17e09ee71385f0a6efcb3b815b4af9865a | |
parent | aa8fc1815c5d11a725a47f085c56e9a643e113ca [diff] | |
parent | 1e1f0188c14be86d18032e60e9e287fc6a94a3de [diff] |
[automerger skipped] Merge META-INF/services/* files in merge_zips -jar am: 1e1f0188c1 -s ours am skip reason: Merged-In I69f80d1265c64c671d308ef4cdccfa1564abe056 with SHA-1 47efcdcf6b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26278260 Change-Id: Ia4aa3a1d1e77f13e564c66df214ec179b3aea300 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>