commit | ccc1815c49f3be03d0c96e7e282c90dcdafa13ea | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 08:59:07 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 08:59:07 2023 +0000 |
tree | cb500c2f28a172d3d8ac5c0889b2f964cfe1414f | |
parent | 5e6dd7ec9f5472f53260f010b9857bc4d164e40f [diff] | |
parent | 0497616c3cc97534faed6d4d42b1f7a3bb0acf32 [diff] |
[automerger skipped] Merge Android 14 am: ae461709c0 -s ours am: 0497616c3c -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: I760d4dea12fb562da958590fe254e4ff9df38f70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>