summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 01:25:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 01:25:31 +0000
commita7dce649b5405066ef4685718d6178067c697362 (patch)
tree215d636551b7cf29909be5a55d0c5cf6d980ea2b /libs/androidfw/AttributeResolution.cpp
parent166a094ebf201d484cac7c34bb64e44fabaded81 (diff)
parent438e63bcaca5fd4ea5a496969f174d721125cf3e (diff)
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into qt-dev am: 1d1446d53b am: 438e63bcac -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158 Change-Id: I34a0be8b312fa22d61d340d4521cd08de21a859c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions