summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-10-07 11:46:31 +0100
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-10-07 16:53:20 +0000
commita5319364ecc2559990744f0cf0d2f8ea289abfa1 (patch)
tree76bb7a51e3310b174c6d606f4d45718a6d68a18c /scripts/merge_json.py
parent5961b2b0040bba1a7bf18870ab4a6bd3ac2b8bb1 (diff)
Properly skip TestBootImageConfig on non-Linux platforms
Bug: 245956352 Test: m nothing Change-Id: I6402573b378eee77d802829ec5dfacf4c514d3b8 (cherry picked from commit 85d8bdc10e08d992fccee67b4708d728d5bc8705) Merged-In: I6402573b378eee77d802829ec5dfacf4c514d3b8
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions