summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 03:57:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 03:57:44 +0000
commitabd233fd889a12b32242fea1ece5ff92e6dac6fe (patch)
tree8476153cd9b928d1e3b4b4502822c1d7c3757902 /libs/androidfw/ConfigDescription.cpp
parente77c3acf60b7363d19b6eeab1c34c5d4ad885a31 (diff)
parenta637f1887669e3b8c883f763ebc3c16e34626e62 (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: 5c6e0c3fe5 -s ours am: a637f18876 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158 Change-Id: I1231cd383bb0884b7c0d12304826c2c413148c37 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