commit | 58ea3c9447fa65de18bdc3c4af93bffb8e58577e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 19 18:52:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 18:52:23 2023 +0000 |
tree | 3caf0b3bb70db69fcd1902b962e8dffe8d88d9c2 | |
parent | 5413555d104ec34dcad72dc96383c0b177dd8a7f [diff] | |
parent | 37b59a0017340a0951195e93f53f2904af76b16d [diff] |
[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 37b59a0017 -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: I8874740124de6fc5c73155698171977c38239f76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>