summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 22:00:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 22:00:06 +0000
commitdd45fef7cde3fe8a32ca8213e86fbbcfb44ee0aa (patch)
tree462d5b22cf1984cac73e96f96da3287e655170bc /libs/androidfw/ApkParsing.cpp
parent3c027f0a612292ad0f5dcd765cfaf2a79044f280 (diff)
parente9930fba5d8589624901f35fc800480041c240f8 (diff)
[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f am: 88bc01ef01 -s ours am: 66a5cc9a0e -s ours am: 1688b4a580 -s ours am: 8aec6a9f30 -s ours am: e9930fba5d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772 Change-Id: I0022c88b0baa71af424f9208286111003662f448 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