| commit | 59e08f242e9e97a0f49ac6b60d68703ee8b35020 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Oct 01 11:24:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 11:24:17 2021 +0000 |
| tree | e6cd95f152b536ded9e876b197e31fa4d0d68b88 | |
| parent | 633ca9c492d7e768e6878b00ba74ed83073305e1 [diff] | |
| parent | 474565918bf73822bcf36082d0a34ef217f539c7 [diff] |
Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450 Change-Id: I84da42c48c855410193f2e319507bc2e48031a66