summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 05:08:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 05:08:49 +0000
commit0fb3ef55b848fcc155810258015cb09fecc34e73 (patch)
treecddbf8228814fc404052b99609655e82d31ad951 /libs/androidfw/ConfigDescription.cpp
parentab9ae86bd2a108eb0ad6c76facb304fe006fc00d (diff)
parent3d96cd6e6da6482a1d894a6ae7ff49583ab0f08f (diff)
[automerger skipped] Merge "Revert "Trim the activity info of another uid if no privilege"" into tm-dev am: 3d96cd6e6d -s ours
am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b563f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251403 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20828778 Change-Id: I15e82f2a20bd38f8a4de00786ff9a9364f2c0a1f 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