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