| commit | df675dd4d533e096858fc208328850e2da576a0c | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 08 10:07:18 2020 +0100 |
| committer | Anton Hansson <hansson@google.com> | Thu Sep 10 08:26:21 2020 +0000 |
| tree | ffb9d1b3619ac7db5997d02fec7904d56351397e | |
| parent | 4324ddb0e807d9c1eb50cd2f6f580cb3ca8f69f3 [diff] | |
| parent | 54767aae6c0dd097688247b2fa353d17a468c4c8 [diff] |
Merge mainline-prod into master $ git merge -s ours origin/mainline-prod There is only one commit not from upstream 099c3b07661efb98cdcdb597bc9f09e2611d014b ...but it is a cherry-pick from master. Bug: 168176832 Test: presubmit Change-Id: If8d7cb4fb57d09096205c2c65930f00b5390f6dc