summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 02:54:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 02:54:09 +0000
commit5c6e0c3fe54a3a3149dca551c47220d4d2ab762f (patch)
tree734560d08bac1cc12d33de4b53e8bdc861bf3a42 /libs/androidfw/ConfigDescription.cpp
parent0011edcc2a6560cecbe4cc52e25a4937844c766a (diff)
parente96853e79cb800b3c2979b282898d56ca5f4edb9 (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: a7dce649b5 -s ours am: 3abf3b4e63 -s ours am: e96853e79c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158 Change-Id: I16abdfb45eef3abf69097bf918eedb531794d674 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