commit | 7d70189efd293e6352e16482d8ae9519420ae949 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Fri Jul 19 18:49:58 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 19 18:49:58 2024 +0000 |
tree | ee120a43bc2d2852d33512f226723e0ca1e42dc9 | |
parent | 2b742f17fedf93601fa9b15f8287e7f6e0749aa2 [diff] | |
parent | 0a8c338b9acfa85730f00e4a3a657bce123dc70f [diff] |
[automerger skipped] Merge changes from topic "2024-06-19-aosp-future-cp" into aosp-main-future am: 0a8c338b9a -s ours am skip reason: Merged-In I7c13021f539a38b3eb493ddbf3c04eadd5d8ef81 with SHA-1 d017c334ac is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28387509 Change-Id: I7eb267207745671170a357f593bb51dedaacd744 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>