| commit | b73616944042578cdc08d245be966df93c329066 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Oct 15 19:46:17 2024 +0000 |
| committer | Makoto Onuki <omakoto@google.com> | Tue Oct 15 19:46:17 2024 +0000 |
| tree | 784c946989fdf3ae0101ad0e30031221aa028354 | |
| parent | 72354784239bb1540cb11b095535b8e050dc97da [diff] | |
| parent | 4f02e86a95ae01335c0176a657f3d6f960de650b [diff] |
[conflict] Merge "Move ravenwood tests to f/b/r/tests" into main am: 4deeb409b7 am: 4f02e86a95 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3309255 Change-Id: I225bd1dca765131a15668106b6801afdc5de0744 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>