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

Commit 9e57dd74 authored by Yuexi Ma's avatar Yuexi Ma
Browse files

resolve merge conflicts of e41f2913 to oc-mr1-dev

Bug: 62349323
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7a232c1cbf3dd61ccf7c11f235829801ff98f899
parents f4998a11 e41f2913
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
//

cc_test {
    name: "VtsHalEvsV1_0Target",
    name: "VtsHalEvsV1_0TargetTest",

    srcs: [
        "VtsHalEvsV1_0TargetTest.cpp",