Fix the incorrect merge conflict resolution
This change fixes the incorrect merge conflict resolution of
3b178969506ca9bb35e7c80dbab3b2ad39fc180b
Bug: N/A
Test: m
Change-Id: If00db9ab9758384a2def5442fbeecb36615d2ec1
diff --git a/apex/apex.go b/apex/apex.go
index 4f5f247..160c5eb 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -743,14 +743,12 @@
"kotlinx-coroutines-core-nodeps",
"libprotobuf-java-lite",
"permissioncontroller-statsd",
+ "GooglePermissionController",
+ "PermissionController",
}
//
// Module separator
//
- m["com.android.permission"] = []string{"GooglePermissionController", "PermissionController"}
- //
- // Module separator
- //
m["com.android.runtime"] = []string{
"bionic_libc_platform_headers",
"fmtlib",