tree 2a4c85b1b38d4dc28060ea1a65b76b78ec741e01
parent 5b79fa441325ad0fdf60dd1f1454685fe21d0306
parent 7ba4d8932e3c0f2335d68c74a99859b30a14e3b4
author Paul Colța <donpaul@google.com> 1700138425 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700138425 +0000

[automerger skipped] Merge "Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777becfa" into android12L-tests-dev am: ee000fe9a8" into android13-tests-dev am: 02a358d21b am: 1104737e87 am: e2b60b30ed am: 309c6d2f6b -s ours am: 8ffb5a59ae -s ours am: 7ea94d233e -s ours am: 7ba4d8932e -s ours

am skip reason: Merged-In Iabec62cb23301d00a2e7d4808a801b443f0fb392 with SHA-1 26e69fd6b5 is already in history

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

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