summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 03:28:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 03:28:51 +0000
commitf0761639fe797d14ba66696c3da0d0bc0ee2a681 (patch)
treecddbf8228814fc404052b99609655e82d31ad951 /libs/androidfw/ConfigDescription.cpp
parentcd7514f9a91734b9d0fac719dfda24322f56fb9e (diff)
parent18effe55378fc801837e1587bcf14b6ff78476c5 (diff)
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours am: 18effe5537 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20844717 Change-Id: Ic9064dea92a1f291e3458b0ea404fe02293c6f43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions