| commit | 1576f8458ce90f53d715ba562d58f3260c9ebdea | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 19 23:59:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 23:59:12 2023 +0000 |
| tree | 20ad33fe8ee91f07af01bb72adc82d4f4fdcb8e9 | |
| parent | 42d01fc655f6b0ed726685924898c302f43e84ff [diff] | |
| parent | 58ea3c9447fa65de18bdc3c4af93bffb8e58577e [diff] |
[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 37b59a0017 -s ours am: 58ea3c9447 -s ours am skip reason: Merged-In I0a7233e0124a8c4defac51baa1a001fdbefeb4eb with SHA-1 63ca34ef06 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25090532 Change-Id: I22a8815a54327c49442034c1aa3e210fbe96ae5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>