| commit | 70ed3f7c3aca8d262ea9ab7f26095cf7b44a8a19 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Jan 11 19:31:30 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 11 19:31:30 2024 +0000 |
| tree | bbdc3210bd87cfd074ad8101197caa632644e2d0 | |
| parent | 220434db08c9669deb84cefb9aba0a2a47946b64 [diff] | |
| parent | 78dac087a2ec946d7506d0bf5a740e800dae10fb [diff] |
Merge remote-tracking branch 'aosp/upstream-master' am: d7dff33e9c am: 78dac087a2 Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2901510 Change-Id: I18474d7cac35343065d789033877a2287fdc6a95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>