| commit | 647350fac8837867faac37d9dded26a7c1ed346b | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Jan 27 07:54:39 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 27 07:54:39 2022 +0000 |
| tree | a1d27d658a56b31ed3bb8160de19fc370b02d259 | |
| parent | cc9fe38f571de0f2e521f8d4e26fd408b566fcde [diff] | |
| parent | a8f97bdd8a6be5982deeafa53711f87b4b054f28 [diff] |
Merge "Let the connectivity module see the shims" am: a8f97bdd8a Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1961208 Change-Id: Ic0a786c24153387ee905c14d65b8c0ff088cec3a
diff --git a/Android.bp b/Android.bp index 8555256..683d2e7 100644 --- a/Android.bp +++ b/Android.bp
@@ -50,7 +50,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