| commit | 698aa376a86c42b32bf26cc878e97182b759344b | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Wed Sep 27 01:19:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 27 01:19:40 2023 +0000 |
| tree | cf529a0b01259388dd2c494504895428a26618e4 | |
| parent | 8dd0f1a5af0dcdbe252db400f692068d5ed56cb7 [diff] | |
| parent | 0887d3a78f7e8af45073400d7cc3c3b6d0e1b5ba [diff] |
[automerger skipped] Merge "nfc(api): Mark some data types as formal API for mainline" into main am: 4eb41e2e89 am: 8febb9ddcd am: 48fd52ba24 am: 39f7bc6395 am: 0887d3a78f -s ours am skip reason: Merged-In Ib1f22395567386a6e802d78b6fe359f92c3847d7 with SHA-1 51c5d5ede5 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2636313 Change-Id: Ia7630eb2caae0a4595dee75850e75d29640c2369 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>