| commit | 3dce3c28716fb6b749495c52fa97ce6c1a58b2ec | [log] [tgz] |
|---|---|---|
| author | Kimberly Kreider <kkreider@google.com> | Thu Nov 14 15:52:18 2019 -0800 |
| committer | Kimberly Kreider <kkreider@google.com> | Tue Dec 17 22:31:35 2019 +0000 |
| tree | ba67dd5bbed8a20262de935f798adfa46151761c | |
| parent | 1bc59c39bf6a116bfa7f1da5587f883e19bdb65b [diff] |
DO NOT MERGE: Merge tools/tradefederation/contrib project into qt-dev. Bug: 143908003 Change-Id: I3c5098c02a0f045463ef01c62b99f1006f7b5831 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I1712c514261d45a93f649b838f381550fea2631b Merged-In: I73f9249d6b0cca01f4dfd45b702963d5a05f159c (cherry picked from commit 73bc36f5bc74b8c2fcffbad1176e8c5b6fd96469)