summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 01:29:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 01:29:42 +0000
commiteb31534637bcff1d77f954f0154bb785bf7814ce (patch)
treecddbf8228814fc404052b99609655e82d31ad951 /libs/androidfw/ConfigDescription.cpp
parent9e4a5f21c39f90617912405b390d9f6c0ac0f5d0 (diff)
parenta6074b72b667807733317375e25b5bdf3834d53f (diff)
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-dev am: b9319ef760 -s ours am: 49b1b5e175 -s ours am: 00495e8dcd -s ours am: a6074b72b6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20859465 Change-Id: I2135fe292b6c6cf6aec75ee52adee059378c1152 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