commit | ef18e071c11ab6a61b17ebd3afc60f1a085672b1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:50:41 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:50:41 2023 +0000 |
tree | d2834d967b0a297022567692be3ba9a31e03036e | |
parent | 5083f7771fa7242ee85198498510c6acf50cc733 [diff] | |
parent | ccc1815c49f3be03d0c96e7e282c90dcdafa13ea [diff] |
[automerger skipped] Merge Android 14 am: ae461709c0 -s ours am: 0497616c3c -s ours am: ccc1815c49 -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: Ie8fa968cac8e431078d908fba706ac011c113c19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>