diff options
| author | 2023-06-20 17:09:03 +0000 | |
|---|---|---|
| committer | 2023-06-20 17:09:03 +0000 | |
| commit | 1f876020cff14844c9f65bb7be81075ce7fd5e75 (patch) | |
| tree | 99cf2914e893dfaa5153acb1539cd6a3a840384b /scripts/jsonmodify_test.py | |
| parent | 975051cb58fb9807b343d6b46a1bfc30957d9f42 (diff) | |
| parent | bf1b88dd35e26cb8a3e33fc475789f4b05712660 (diff) | |
Merge "Add -gen suffix to genrule targets with conflicts" am: bf1b88dd35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2626356
Change-Id: I696eaeeba8ea5c2c1be0b25ff76a6934d4add83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'scripts/jsonmodify_test.py')
0 files changed, 0 insertions, 0 deletions