summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2023-02-23 22:30:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-23 22:30:27 +0000
commit0bf2f95a4180ffba0232a47e9e650aceec2b7f83 (patch)
treec1be8a5025501606196d2cf68291dec9222c7f5c /libs/androidfw/ApkParsing.cpp
parent0f811a27b92a2ec4b8024f316604cec692a9b5c2 (diff)
parent95a008d8ec5d1651d256c5083cc5a62d08d25f36 (diff)
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 4d6f934469 -s ours am: 93b2953bd4 -s ours am: 95a008d8ec -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480 Change-Id: I33f1844936520459e80c991ac49e31e20970c305 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions