Anton Hansson b103f0d765 Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126

Change-Id: I1069faa26c031375b8ffb3700c9c8ceb156cbfa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-06-24 19:36:58 +00:00

..

Android.bp

Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561

2022-06-24 19:36:58 +00:00

api_versions_trimmer_unittests.py

…

api_versions_trimmer.py

…

api.go

Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561

2022-06-24 19:36:58 +00:00

dump_api_shas.sh

…

gen_combined_removed_dex.sh

…

merge_annotation_zips_test.py

…

merge_annotation_zips.py

…

OWNERS

…

TEST_MAPPING

…