| commit | 8647a4ea24926a81e1415aea5ddaa9c65a681869 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Jan 11 16:54:56 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 11 16:54:56 2024 +0000 |
| tree | 3e33025352f9eaf60636951e7e1931e4e56cc219 | |
| parent | 5d00ceee6b5c5c7d7ba2cce6372ec082a729eaf4 [diff] | |
| parent | cc522d005360220f685787d94739d65f6c9ee264 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' am: 02bd81f6e8 am: cc522d0053 Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2904651 Change-Id: Icf1b70e87e1ab7171a2d2fbdbf69efb17e5eb721 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>