tree 4624ef24fc62988f2b8da43b59809721a516509b
parent af77450f29ed9073eff9b0211a8307432e92540c
parent 90787b09fa7915935027469f3decef750ce6f8a0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1695858900 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695858900 +0000

Merge "OWNERS: master -> main" into main am: 6dbe50e30c am: 90787b09fa

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

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