tree 4b74b0f3832db1651b7768b5c290eaf4f916ae50
parent a3237eaa3c40be3139c468dcc906ec06c0bbeebb
parent 83a846f39877b0b5194c0003b6f0fe2275e35a0b
author Treehugger Robot <treehugger-gerrit@google.com> 1594067076 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594067076 +0000

Merge "dist annotations.zip and api-versions.xml" am: 59d6611224 am: 83a846f398

Original change: https://android-review.googlesource.com/c/platform/development/+/1356106

Change-Id: I243dfb3dd1f7ed3ce3f12f9eb04676bcb493ee35