Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2
am: c8458cb3b9
am: a398c99862
Change-Id: I9edea5a579bdd0c4552ed5627906fbd30d6eadb4
This commit is contained in: