summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-08-16 15:43:20 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-08-17 09:19:32 +0000
commit719cc628ce796966fd9a43096ab41696bbf08a16 (patch)
tree7bed87ca0aea44825ad2ef4b4601fbacd3081ff7 /scripts/merge_json.py
parent8bfefc0e7563e8c50fa6c428b342cddd0e1b7b84 (diff)
Revert "Check that API is up-to-date when building java_sdk_library"
This reverts commit c166b6858947161d6e958090f11fe33001427c05. Bug: 234113632 Bug: 236187167 Reason for revert: causes problems with update-api, see b/236187167 Change-Id: I4c88151cb5e2c86bb6c1a955c5065966a4fbb3e0 (cherry picked from commit e7a8664a6a37be95d8b6b55c35b74c8b8b7e8765) Merged-In: I4c88151cb5e2c86bb6c1a955c5065966a4fbb3e0
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions