[automerger skipped] Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" into sc-dev am: cd60664cc3 -s ours

am skip reason: Merged-In Ia22ebac4baec60f72b8516e9e79998cd788266ab with SHA-1 899eb7282d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410005

Change-Id: Ic60b59a28abfcc8e851147d9fbebee4055182296
This commit is contained in:
Yanting Yang
2021-05-05 08:19:58 +00:00
committed by Automerger Merge Worker

Diff Content Not Available