| commit | 6e367d8a1960e4aca4213ad576b474bb45de1fb4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 04 22:56:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 22:56:12 2021 +0000 |
| tree | bb28d030e41ebc7ef0262d3a4c21b2fdfa053ff3 | |
| parent | ea15d442b28f74e42b9f6f30e2fcfd8042e6d6b1 [diff] | |
| parent | affd693c7db89caa000dee8d6f25fa78e2715750 [diff] |
[automerger skipped] Merge "Remove annotations that have been relocated" into stage-aosp-master am: 91852757e3 -s ours am: affd693c7d -s ours am skip reason: Merged-In Ic0ec9c3c12571b3405c1b7668528f5c50d083896 with SHA-1 1176cad7f2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14392064 Change-Id: If9138d77c0bad64ab833ee11829878292bb7b5b7