tree 72245e93621bfb0e5dcfe92eff2ce75c9312a64f
parent fd225d95ed842431b12763956bafc28e3e97a721
parent a4de19e6c031b378badfa6f410beefac62db957a
author Anton Hansson <hansson@google.com> 1631891577 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631891577 +0000

Merge "Move annotations in public api to frameworks/base" am: f664101210 am: fabe544f0f am: 818a9c5820 am: a4de19e6c0

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

Change-Id: Ic0e3ce6f6f793f8e1d06ece68a982b988a52c710