Merge mainline-prod into master

Browse Source

$ git merge -s ours origin/mainline-prod

There are only two commits not from upstream:
a732b3a5a2
1be2664406a2e697044f483a44c547973f915e3d

But both of these are noops in master (due to Merged-In).

Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705

...

This commit is contained in:

Anton Hansson

2020-09-08 09:59:23 +01:00

parent 7299c8ba41 1433252635

commit 5aa8e25cdd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available