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

Skip to content
Commit bfe605c7 authored by Nathan Harold's avatar Nathan Harold
Browse files

Merge commit 'be0f9bb8' into goog/master 

Trivial merge due to hash changes on adjacent lines.
No actual conflict.

Test: ./update-makefiles && make
Change-Id: Ie46406cce354647ca8be5e0660f3d7b953a5f796
parents 0e99148d be0f9bb8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment