Merge "Python merge use git choosing strategy default"
authorAric Gardner <agardner@linuxfoundation.org>
Thu, 30 Jan 2020 19:30:51 +0000 (19:30 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Thu, 30 Jan 2020 19:30:51 +0000 (19:30 +0000)

Trivial merge