| commit | 7810c5c7df9eb81fbc1a578d4c5dba41d095a93f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 09:04:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:04:23 2023 +0000 |
| tree | cb500c2f28a172d3d8ac5c0889b2f964cfe1414f | |
| parent | ccc1815c49f3be03d0c96e7e282c90dcdafa13ea [diff] | |
| parent | ec1308fdafc41684c8ea0d8df6949e46c4f3bfe3 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 031de969c6 -s ours am: ec1308fdaf -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: I4fb43a14c7a08df657345fe072e204abdd90e2da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>