tree 41d9f6140147d5344eda3b565dcd5e1a0ae6fb3c
parent 4cab9e2615356165a4667b9b28a234fbebe34139
parent e80bd31e90a85f00290096759f3351fa29ca6f38
author TreeHugger Robot <treehugger-gerrit@google.com> 1676761614 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1676761614 +0000

Merge changes If5f4a7b4,Ie58b6947 into udc-dev

* changes:
  SF: Remove unused property of test DisplayVariant
  SF: Deduplicate mock scheduler setup in tests