| commit | 18d8a5c96a9dbfbe89ea714b4618b6fe902fbdfa | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Nov 15 19:12:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 15 19:12:16 2024 +0000 |
| tree | f384ed9d96e617f31404836db989f45c20f77b76 | |
| parent | 3fd33a3cac6a570daf7795b42fdf299fb5dc18ff [diff] | |
| parent | 8663c4cbbea509632b2ede444df7eefe06a5e206 [diff] |
[automerger skipped] Merge "Make aosp-main _mostly_ in sync with goog/main" into main am: 34aa8a61f6 -s ours am: 8663c4cbbe -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: I7d8c9a0c35f8801711d69cedbcbf93b90c773652 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>