tree b01a8d3edaad8474be7544e1a705b572c0772d1d
parent 9754eccd82c574ad31e6a17b96436b2f1c95f5a7
parent dad311d2ffc5405cde03b419b2379a71e2c0e3b2
author Anton Potapov <apotapov@google.com> 1698693815 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698693815 +0000

[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c77 -s ours am: dad311d2ff -s ours

am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f4d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25103281

Change-Id: Iee16971479cdef274a683bfa272e968da71feb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>