summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2024-09-20 08:35:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-20 08:35:41 +0000
commita75c89fb8141bd0e2669d29adee24572204314ab (patch)
treeed50d05c1a72ee00deadf8d03b1437ca2f6217e0 /scripts/merge_json.py
parent548cecc0de1db5c8dcb3c5a2e56fc70825296f0c (diff)
parentb33154033a3011bb3aaa639de86ceb51aef09c6a (diff)
Merge "Make init_rc property configurable" into main am: b33154033a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266331 Change-Id: I232c85e9d7a414b2047e8aa2ad9374f5f03d8d45 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