tree a94382c9bbe396e612b04af0826550c21d28e3b1
parent 57a10b3920fa980031d419cdb445f8544531db0f
parent 39f7bc6395c5ba37522095cf8273383225e02f22
author Roshan Pius <rpius@google.com> 1695776747 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695776747 +0000

Merge "nfc(api): Mark some data types as formal API for mainline" into main am: 4eb41e2e89 am: 8febb9ddcd am: 48fd52ba24 am: 39f7bc6395

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

Change-Id: I02ceab139d4109530f462d50e6e35b505aae2d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>