tree 141d2e2fc85f9bd4b8ebaf0bc831ee7bafa251fc
parent bb209c32a4b6395f2f50b1c22094c94cf4e17f7c
parent b7817ff439cabf35330a58798e93d5e90085b888
author Treehugger Robot <treehugger-gerrit@google.com> 1657928721 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657928721 +0000

Merge "all active branches are now T aware" am: d7c57379e7 am: b7817ff439

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2153614

Change-Id: I2863dc4b741caa12cfa9642797724f212d772083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>