| commit | 39c0f802e8fbe9bcc1bb595aa923af6c7a7f641f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 04 23:55:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 23:55:37 2021 +0000 |
| tree | 6d5d48d5f6a9b4d2ea2ccf509dcfcdb0b596195a | |
| parent | 534b1ea38f7597d4fdb5f4e8b97facd9e7008dda [diff] | |
| parent | 7bb2ad33e474c5e70a737981ee79649adab44e60 [diff] |
[automerger skipped] Merge "Remove annotations that have been relocated" am: 7a622ea7eb -s ours am: 1ae88c4be8 -s ours am: 7bb2ad33e4 -s ours am skip reason: Merged-In I024252070bd806d50d54377190fdc5cd5b4445e1 with SHA-1 bda79da64b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692855 Change-Id: Ife16dc0e3aab96e7bb2237e90b198dd06c95e9cd