resolve merge conflicts of e41f291381 to oc-mr1-dev

Bug: 62349323
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7a232c1cbf3dd61ccf7c11f235829801ff98f899
This commit is contained in:
Yuexi Ma
2018-03-29 16:30:28 -07:00

View File

@@ -15,7 +15,7 @@
//
cc_test {
name: "VtsHalEvsV1_0Target",
name: "VtsHalEvsV1_0TargetTest",
srcs: [
"VtsHalEvsV1_0TargetTest.cpp",