tree 8a343e9c6dbbbdd610e4115bfb1ed54fa593ca0e
parent 7451907617fcc8e443e202d9823fdddd11ab245b
parent af4e6aa026d3288db90a4ab979fd6518da2338ae
author Louis Chang <louischang@google.com> 1673583348 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673583348 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege" into sc-qpr1-dev am: fd612ab925 -s ours am: af4e6aa026 -s ours

am skip reason: subject contains skip directive

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

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