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

Skip to content
Commit 347be403 authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

resolve merge conflicts of 56bf7ca8 to master 

Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
parents 5a9a5cfc 56bf7ca8
Show 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