| commit | b6165c58933e526ef4b6651fc4d93efe2040ad45 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Oct 01 11:59:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 11:59:47 2021 +0000 |
| tree | 0058c0ddb75b284379c5d3235a81a6c073eb79b7 | |
| parent | ea1857ae37c99814155d6d2407229e8d51efb3fa [diff] | |
| parent | 866b068b9dd8cc89701ef3b7d43fb0d399268cea [diff] |
Merge "Revert "Add build rule to merge annotation zips"" into stage-aosp-master am: 474565918b am: 59e08f242e am: 385b55ede0 am: 866b068b9d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951450 Change-Id: I432f3c8d646f04d33614a66183eadf07aba99639