Merge commit '864a2b0e25da01885f558bde41e9da73801c790e' into manual_merge_864a2b0e25da01885f558bde41e9da73801c790e
Change-Id: I39f86a02a4d7ccdc3674be61ad96ec9b05fed617 Merged-In: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2 Test: TH Bug: 156287389
This commit is contained in:
@@ -670,7 +670,7 @@ java_library {
|
||||
|
||||
filegroup {
|
||||
name: "framework-ike-shared-srcs",
|
||||
visibility: ["//frameworks/opt/net/ike"],
|
||||
visibility: ["//packages/modules/IPsec"],
|
||||
srcs: [
|
||||
"core/java/android/annotation/StringDef.java",
|
||||
"core/java/android/net/annotations/PolicyDirection.java",
|
||||
@@ -1265,4 +1265,4 @@ java_library {
|
||||
filegroup {
|
||||
name: "framework-telephony-jarjar-rules",
|
||||
srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user