Loading Android.bp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -50,7 +50,7 @@ package { // have a different value depending on the branch. // have a different value depending on the branch. java_defaults { java_defaults { name: "NetworkStackNextEnableDefaults", name: "NetworkStackNextEnableDefaults", enabled: true, enabled: false, } } // This is a placeholder comment to avoid merge conflicts // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values // as the above target may have different "enabled" values Loading Loading
Android.bp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -50,7 +50,7 @@ package { // have a different value depending on the branch. // have a different value depending on the branch. java_defaults { java_defaults { name: "NetworkStackNextEnableDefaults", name: "NetworkStackNextEnableDefaults", enabled: true, enabled: false, } } // This is a placeholder comment to avoid merge conflicts // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values // as the above target may have different "enabled" values Loading