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

Commit d0f2f3de authored by Fan Zhang's avatar Fan Zhang
Browse files

resolve merge conflicts of 111b81dc to master 

Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d
parents c721a4e2 111b81dc

tests/app/Android.mk

+3 −3

File changed.

Contains only whitespace changes.

tests/app/AndroidManifest.xml

+2 −2

File changed.

Contains only whitespace changes.

tests/unit/Android.mk

+3 −3

File changed.

Contains only whitespace changes.