Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 5480adb1 authored by Anton Hansson's avatar Anton Hansson
Browse files

Merge mainline-prod into master 

$ git merge -s ours origin/mainline-prod

There are only two commits not from upstream:
05cdb997
1be26644

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

Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705
parents 7532b221 6a0ecfb9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment