commit | fcb86e20e1ca921760cb7e84c9c9618a21521ab0 | [log] [tgz] |
---|---|---|
author | Anvesh Renikindi <renikindi@google.com> | Wed Mar 20 20:46:48 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 20 20:46:48 2024 +0000 |
tree | 72b53c937593f4dab67e408ac741706c984c6ecb | |
parent | c75cef5c625f1dad902d978ea1079e03ea92fcbc [diff] | |
parent | 4ecab603faa64b70d660d6fcbf82a351eaec781d [diff] |
[automerger skipped] Merge "Fix ambiguous reference on ComplicationViewModelTransformerTest" into main am: 91fb4f74df am: 4ecab603fa -s ours am skip reason: Merged-In If12ce8b219143e6642a988bc3f1611412d420e5a with SHA-1 472a4f2340 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3003251 Change-Id: I5d23ba00e0d845a2698acae32c5a79fc5314c797 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>