| commit | 8663c4cbbea509632b2ede444df7eefe06a5e206 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Nov 15 19:00:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 15 19:00:01 2024 +0000 |
| tree | 9cfe0de2ed1664323053cd00079e42224fd857b4 | |
| parent | 445a84f2b132795ef7edd870810b5db73a5c2f3a [diff] | |
| parent | 34aa8a61f62b62715f7bc110c07e4849471f91b5 [diff] |
[automerger skipped] Merge "Make aosp-main _mostly_ in sync with goog/main" into main am: 34aa8a61f6 -s ours am skip reason: Merged-In Ie9c5deb25ec5f8594feac15b2a3f41b40a65e4f0 with SHA-1 1d74c21fb6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3354024 Change-Id: I9c7157fb760dea4bc933cb127ad44700dde71c26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>