| commit | e1c5d4c6ff1b7c978cfdeedfd54f58556c8401fd | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Wed Apr 13 04:59:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 13 04:59:53 2022 +0000 |
| tree | 2b839229f08c6f2d24e04e8bab0568b1b4c67fa0 | |
| parent | 47a6732a402b22e7ceb8538ccd0daeba95ce789e [diff] | |
| parent | 2dda961afb1f94285f04951333e735afd03b29e2 [diff] |
Merge changes from topic "vpn-api-fixes" am: 5078c364ba am: 2dda961afb Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2030531 Change-Id: I5882281f95572bc7482671d628f457098e886395 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index ef43047..ec7f8b0 100644 --- a/Android.bp +++ b/Android.bp
@@ -52,7 +52,7 @@ // have a different value depending on the branch. java_defaults { name: "NetworkStackNextEnableDefaults", - enabled: false, + enabled: true, } // This is a placeholder comment to avoid merge conflicts // as the above target may have different "enabled" values