diff options
| author | 2023-12-11 22:06:31 +0000 | |
|---|---|---|
| committer | 2023-12-11 22:06:31 +0000 | |
| commit | ec49ce94ea65312b104800187e0045a97c90ed17 (patch) | |
| tree | 17c9cacbfcf01a846064f66ed9c1726c73ec62f9 /api/api.go | |
| parent | 3fbe46d148745dc73115268e44db92b72b917844 (diff) | |
| parent | 36d0ed5847c9f50199eec7e664d63cb455645a16 (diff) | |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 7fd8fcb360 -s ours am: 36d0ed5847 -s ours
am skip reason: Merged-In I05a5865b2ee13be65e16a8a0bcdc58fc33e4d461 with SHA-1 249f348c59 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865780
Change-Id: I670ac8fc7057a37be88902a0ffd35d4aeae532f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
0 files changed, 0 insertions, 0 deletions