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

Commit 7a8295e0 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolve merge conflicts of 311ec896 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia332f1e3d9c894f5fd36674ff3c75e4896b2c13a
parents 6b140bed 311ec896

tests/Android.mk

+1 −1

File changed.

Contains only whitespace changes.