commit | 83d4508a1293ab519cbb3c3f20d2b6778154580b | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue May 04 21:46:16 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 21:46:16 2021 +0000 |
tree | e81823b84901122a5a5d2efa16f7607900589758 | |
parent | 5f1fac6a583554738a2dca9fb6c75e166c06cc37 [diff] | |
parent | e6269baabbc098132fb9e50baac160ac96a0c46e [diff] |
[automerger skipped] Merge "Remove annotations that have been relocated" into rvc-qpr-dev-plus-aosp am: e6269baabb -s ours am skip reason: Merged-In Ie6d4938961f7725cc141dd1a43f69a906b913f24 with SHA-1 3f0c3db187 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14392063 Change-Id: Ibedbb9179bc14446f2efcbf19a5d39c3efb41847