tree ee490e17edae86cc3030c6c030b5bc80325120b3
parent 93f78435b0aa34ae310d7d1f1a22a899414b1904
parent 8d8df0a47a8283fe6493b8f724cc1260e2e5318a
author Kuan-Ying Chou <kuanyingchou@google.com> 1657736599 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657736599 +0000

Merge "Fix failed tests on Windows" into androidx-main am: 8d8df0a47a

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2152754

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