| commit | 47ee8bb1fbe268e7e6fd1b1cc9a786049fa56efd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Apr 25 04:55:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 25 04:55:35 2022 +0000 |
| tree | 9ede281474369b982fc0e4cba6b92b130943837a | |
| parent | c3e2270fccbd225c79bc5f2c861a5e7327c35e5b [diff] | |
| parent | b6329aec6297b29e99b14c82ab3c9bff6b1bdae6 [diff] |
Merge "Use .cn URLs for validation on Chinese SIM cards." am: b6329aec62 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2072831 Change-Id: I3918837181bb21f3400246c1ea34d9c9e06e4fc1 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index ec7f8b0..ef43047 100644 --- a/Android.bp +++ b/Android.bp
@@ -52,7 +52,7 @@ // have a different value depending on the branch. java_defaults { name: "NetworkStackNextEnableDefaults", - enabled: true, + enabled: false, } // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values