tree aabd61d93bdca189e023d5ada3f9233353266799
parent d9e72502b1b7f46d2c973b4298199a5b0ed92340
parent 46fdc734decaa98be3c0cab8fd4b6559767e9b50
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692786144 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692786144 +0000

Merge "Adds android.permission.REGISTER_NSD_OFFLOAD_ENGINE" into main am: a0ec1987d8 am: 46fdc734de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2696913

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