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