summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 22:39:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 22:39:38 +0000
commit9c850b8a1bf831c4fa2acc6375a89e6de6e259aa (patch)
tree4733d0d3d01646fe465106c8d09bceab5ef485ba /libs/androidfw/ApkParsing.cpp
parent3895ab7be56f5f74e8a2230e5da60cb36331eb86 (diff)
parent11da315090798b14832c621b5572869084f4ab4d (diff)
[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-dev am: 07272cfaee am: 48994ad16f -s ours am: bee0f8e576 -s ours am: a64d31ef63 -s ours am: 045b6d8d0f -s ours am: 219dd7252a -s ours am: 11da315090 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772 Change-Id: I4c62f3608284d932bd367e5994bcca95551c1b76 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