| commit | 247163d8facb5009ea3c422b2227e6c618e8b5bf | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Mon Oct 18 10:17:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 18 10:17:45 2021 +0000 |
| tree | 0fb6754920049ef4a31730ca99f9aa6596bead93 | |
| parent | c7fd9921497f5863a8eac14a247f7b0c97b652c9 [diff] | |
| parent | 6ca55f583c7aeccd392d27c731c20ff2f2d70bd5 [diff] |
Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c Original change: https://android-review.googlesource.com/c/platform/development/+/1859259 Change-Id: Ib804d5b9a5e75f3b8952b7f7a10cbb9026ba489d