| commit | 5aa8e25cddf0adc1ddd29337d4dc0c85a325b57d | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 08 09:59:23 2020 +0100 |
| committer | Anton Hansson <hansson@google.com> | Thu Sep 10 08:18:00 2020 +0000 |
| tree | 8ce93bbe4941b4b811b4c18c6922e236a2f09b23 | |
| parent | 7299c8ba41828579334f7751d773bd056fc18ebc [diff] | |
| parent | 1433252635bd81d1088b67ab6c775322baf26caf [diff] |
Merge mainline-prod into master $ git merge -s ours origin/mainline-prod There are only two commits not from upstream: a732b3a5a2bd72c350f2247f0727e1a5318a6e14 1be2664406a2e697044f483a44c547973f915e3d But both of these are noops in master (due to Merged-In). Bug: 168176832 Test: presubmit Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705