summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 04:01:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 04:01:08 +0000
commit0c6699d7e553053937d13f8d4bc20ca905fbb55d (patch)
treedb5b446b4c7cd77ed0eb56bf677f9a979f1944f6 /libs/androidfw/ConfigDescription.cpp
parent323d42b2bc58352b20d8273921fe73519174a7af (diff)
parentf0761639fe797d14ba66696c3da0d0bc0ee2a681 (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: f0761639fe -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20844717 Change-Id: Idb85af792dcba405ebbebc257e2feec905c02fe5 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