| commit | ec1308fdafc41684c8ea0d8df6949e46c4f3bfe3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 07:57:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 07:57:09 2023 +0000 |
| tree | 5f1aeed9d54f1fde2fff6293afa3e1e3bc8e928f | |
| parent | 0497616c3cc97534faed6d4d42b1f7a3bb0acf32 [diff] | |
| parent | 031de969c6f94d746ec3a01585956e46e4ff3e25 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: 031de969c6 -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: I8029ad6665f71186edbf6886caf3e6f6c377145b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>