| commit | 1ae88c4be8d1b0a23bcc678316cea582292044ec | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 04 23:06:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 23:06:57 2021 +0000 |
| tree | e977e070697a971dea560f91ab926b6e8f181fc3 | |
| parent | 91852757e3cbeb99a435d540114ee6627d129817 [diff] | |
| parent | 7a622ea7ebc8396faf6e4b629f9467a34fb66fb3 [diff] |
[automerger skipped] Merge "Remove annotations that have been relocated" am: 7a622ea7eb -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: I1ba5e702bf3e8be192a29098b18dc3d165144194