| commit | 6f07ea3c11045c6dfbec1c0b16eb64a2fb2fe0d7 | [log] [tgz] |
|---|---|---|
| author | Kimberly Kreider <kkreider@google.com> | Thu Nov 14 15:06:37 2019 -0800 |
| committer | Kimberly Kreider <kkreider@google.com> | Fri Dec 13 23:03:03 2019 +0000 |
| tree | 57e356fb453cdd39ae004d15e270504a4dfa1486 | |
| parent | 26c992ca89f2d1c540dbc5d914542f2f9b23a7b4 [diff] |
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 1a48ad892319c72de9ffd23bc430e920ba75f42e)