| commit | affd693c7db89caa000dee8d6f25fa78e2715750 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 04 22:32:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 22:32:20 2021 +0000 |
| tree | bcdc28778d6292e3177d3641c68e9d379caf75fb | |
| parent | e6269baabbc098132fb9e50baac160ac96a0c46e [diff] | |
| parent | 91852757e3cbeb99a435d540114ee6627d129817 [diff] |
[automerger skipped] Merge "Remove annotations that have been relocated" into stage-aosp-master am: 91852757e3 -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: I900da93daed7ebe7afa78d6da10f756a69134b0d