summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 02:03:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 02:03:28 +0000
commitba1ee78ab77aa04db2a97f870826a13f613e48c2 (patch)
tree08a7095e10ebfed65e37d273d8b591e69ddaf3d2 /tools/aapt/Command.cpp
parent26a8abcfba2395f7ee0d1002503e836253e56195 (diff)
parenteb31534637bcff1d77f954f0154bb785bf7814ce (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: eb31534637 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20859465 Change-Id: If2da5dbf03c5934db1e724e963741db85adf14c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Command.cpp')
0 files changed, 0 insertions, 0 deletions