Merge "Delete duplicate SharedLog and use frameworks/libs/net version" am: 31e9089ac5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2127662 Change-Id: I104d9ae4026cd3d12a075ddcce494b0fd3e0c81f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index 55d33bd..4b3d558 100644 --- a/Android.bp +++ b/Android.bp
@@ -47,7 +47,7 @@ // In some branches, this may be module_current instead of module_33 if the SDK prebuilts are not // yet dropped there, meaning module_33 cannot be used yet. -module_33_version = "module_current" +module_33_version = "module_33" // TODO: remove this default and replace with ConnectivityNextEnableDefaults. This will need to be // done separately in each branch due to merge conflicts.