From: Aric Gardner <agardner@linuxfoundation.org>
Date: Thu, 30 Jan 2020 19:30:51 +0000 (+0000)
Subject: Merge "Python merge use git choosing strategy default"
X-Git-Tag: v0.51.0~13
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=01a96e082d0f87e93cfe49157685a70a3e87bd04;p=releng%2Fglobal-jjb.git

Merge "Python merge use git choosing strategy default"
---

01a96e082d0f87e93cfe49157685a70a3e87bd04