tree b9fb1d40db45cc5338154380b82285bf59b3dfaf
parent 725dc5a5092affe2363d9d4a796ec69161cc92a2
parent d380b594b44bc688115964110e86c209746f1fa3
author Louis Chang <louischang@google.com> 1673589884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673589884 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into rvc-dev am: 5603eb78f1 am: 421799ac5e -s ours am: eac1eaf072 -s ours am: d380b594b4 -s ours

am skip reason: subject contains skip directive

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

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