summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 22:39:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 22:39:13 +0000
commit3895ab7be56f5f74e8a2230e5da60cb36331eb86 (patch)
tree4733d0d3d01646fe465106c8d09bceab5ef485ba /libs/androidfw/ApkParsing.cpp
parent68ac9e7a868ab985e9c31d264db7ba3560e2765a (diff)
parentdd45fef7cde3fe8a32ca8213e86fbbcfb44ee0aa (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: dd45fef7cd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772 Change-Id: I4151b62335e6e3e4a608eeb82e8b1cd2c27f13ee 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