tree 9a07f32074ddf08e7911de4c1e69828c138200d0
parent c8aa9df05bab55ba3e3dfd3446c67e76abd0781c
parent 59ba6ef97708f2a00e2f5b5f7d2ab4b50265295e
author Anton Hansson <hansson@google.com> 1631892199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631892199 +0000

[automerger skipped] Merge "Move annotations in public api to frameworks/base" am: f664101210 am: fabe544f0f am: 818a9c5820 am: a4de19e6c0 am: 59ba6ef977 -s ours

am skip reason: Merged-In Ide01e4e7840bddf1e024e9024771e528d17a1d80 with SHA-1 7e8b1188c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827246

Change-Id: Iaf6e117806c3846922e9f3688dacb93433e805fa