diff options
| author | 2024-09-23 23:13:29 +0000 | |
|---|---|---|
| committer | 2024-09-23 23:13:29 +0000 | |
| commit | bffc676d4f0ddfbf89d483c00146f7f8730d8281 (patch) | |
| tree | 7932a3a9dd5ca6f7e8ec26f8a78b9a0241803886 /scripts/merge_json.py | |
| parent | 1b0fddb0153ea7aecc122662aa92060c261f1ee4 (diff) | |
| parent | c561d6d1c3e652fc7c509eb7e93c143588054c9b (diff) | |
[automerger skipped] Merge "Revert "pass read new storage parameter to java codegen"" into main am: 5c1283460c am: c561d6d1c3 -s ours
am skip reason: Merged-In Id12816206a16b17c23e3a53832d268f1600107b3 with SHA-1 9612480ee2 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/build/soong/+/3276672
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3277435
Change-Id: I4e94d8288acb4b4ad3ad40fa014e603473fa7d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions