| commit | f32ff86a0ef4a16a7913c2817b7c10bec60d9826 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:56:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:56:04 2023 +0000 |
| tree | d2834d967b0a297022567692be3ba9a31e03036e | |
| parent | ef18e071c11ab6a61b17ebd3afc60f1a085672b1 [diff] | |
| parent | 7810c5c7df9eb81fbc1a578d4c5dba41d095a93f [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 031de969c6 -s ours am: ec1308fdaf -s ours am: 7810c5c7df -s ours am skip reason: Merged-In Id9763fb487e94440df2e61fbb7910902baa12fa8 with SHA-1 3af3c58ac8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776933 Change-Id: I868856c7c27897f618d17d61c82c10df46b0e8c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>