| commit | 93cc3ccad458dafe8d90d5040230db3328586996 | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Mon Jan 09 09:53:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 09 09:53:35 2023 +0000 |
| tree | a5d8595ac953cb6cf6f2c1feb014493e9b84ab5b | |
| parent | 29af3b6f8d7af68180595f5ceab05743c3fedb34 [diff] | |
| parent | 9e31b74ee53d4cc8d7cd4da2142c6c797b7d80e1 [diff] |
Merge changes I25096f4c,I40ba22ab am: 9e31b74ee5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2374723 Change-Id: Id4c05cfbd9fdea0ddca82925e156200e674ee223 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp index 6a990ee..3f4da10 100644 --- a/Tethering/common/TetheringLib/Android.bp +++ b/Tethering/common/TetheringLib/Android.bp
@@ -23,8 +23,8 @@ // specify a java_defaults target that either enables or disables Cronet. This // is used to disable Cronet on tm-mainline-prod. // Note: they must either both be enabled or disabled. -cronet_java_defaults = "CronetJavaDefaultsDisabled" -cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsDisabled" +cronet_java_defaults = "CronetJavaDefaultsEnabled" +cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled" // This is a placeholder comment to avoid merge conflicts // as cronet_defaults may have different values // depending on the branch