summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2024-11-13 22:17:34 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-13 22:17:34 +0000
commit01cdffe72d4222301a8aa67892e936f0253eaa31 (patch)
tree5ecb66b9a6c778b639e35d1b0326ae910e705e11 /scripts/merge_json.py
parentc324019fbdea678fc9975d28d48139f346fa0343 (diff)
parentb5275328b5cd895159fb31e1b72df46438adaf99 (diff)
Merge "Use VisitAllModuleVariantProxies in generateModuleTarget. Also rename android.CommonPropertiesProvider to android.CommonModuleInfo." into main
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions