summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2023-03-31 19:42:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-31 19:42:39 +0000
commit93694f3f7c85c25a79d6a67f7dd07b784f067775 (patch)
treee43a2808e6af2e72421acc0683ab8f839e96a152 /libs/androidfw/ApkParsing.cpp
parentc5c04168730acbca8755d3ed30326bbced863eb4 (diff)
parent0c702a76a3eb705594c4cd9be5b0db25b8f658f5 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours am: 0c702a76a3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942 Change-Id: Ifc8cfae0475fe1864d50f61db121d9883c8f97f3 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