tree e6a750bb9e8dd77cf676cb325ab6561e51146a3a
parent dc4e115cd7a47930b13b9148c5749e7ddcc51f35
parent 91d6cf86860faa2741aa54443e306e073cd56b4d
author Maciej Żenczykowski <maze@google.com> 1723506699 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1723506699 +0000

Merge "CGROUPV2_CONTROLLER_NAME -> CGROUPV2_HIERARCHY_NAME" into main am: 91d6cf8686

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

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