summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-07-28 10:07:30 +0000
committer Paul Duffin <paulduffin@google.com> 2022-07-28 10:07:30 +0000
commit9bcfe69743f227c6e10f5830d735835529b0c1c0 (patch)
tree8ef0bacb18435cde0d1dca8182feba42f0916fb4 /scripts/merge_json.py
parenta649ad5b31acc91234a7654943510694bda69881 (diff)
Revert "Patch to fix Aug train issue with tethering"
Revert "[automerge] Patch to fix Aug train issue with tethering ..." Revert submission 19432194-presubmit-am-5e598b33be884d9f98a29ce1c3c575fb Reason for revert: Not needed in tm-mainline-prod and breaks bluetooth. Reverted Changes: I57969b85a:Patch to fix Aug train issue with tethering Ie6560f201:[automerge] Patch to fix Aug train issue with teth... Change-Id: If44d16a00847a554862aa139c04370ad30166c74
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions