Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307 Change-Id: I90a6fab929bdb84f035c2b816af661d29dc368d4
2018-06-08 11:06:45 -07:00
parent 9e4e57d5b8 410f48ca0e
commit debc55209d
6 changed files with 29 additions and 9 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -41,6 +41,8 @@ var (
 		"services",
 		"android.car",
 		"android.car7",
+		"core-oj",
+		"core-libart",
 	}
 )