Commit 3f016110 authored by Kimberly Kreider's avatar Kimberly Kreider
Browse files

DO NOT MERGE: Required platform_testing changes for merge of tradefed repos into 

qt-dev.

Bug: 143908003
Change-Id: Ib0250056d090de120b7396ac733989179fcf1aba
Exclude merging into *-plus-aosp branches, since they already include the change.
Merged-In: I2ae86ba9706747873268192988c32879005ed0f7
Merged-In: I38efc115f2c691754d481fdffb6630607ef970e8
(cherry picked from commit 1a48ad89)
parent 172bf833
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment