summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 21:14:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 21:14:53 +0000
commitacec179401a290bd4d51981f20a646c4522099ae (patch)
tree41bce9575ecadf7bcebf2ef785244db7fcca71db /libs/androidfw/ApkParsing.cpp
parent6a2dd9b9abadc96d52aec5b17573d099e22c4609 (diff)
parent507b0f2dd9e08582ed3d1da937bc620cdb99fcd0 (diff)
[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef64 -s ours am: c9c86978eb -s ours am: 462c8eb5d8 -s ours am: b3a7fbe29c -s ours am: 32118f6616 -s ours am: 507b0f2dd9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988 Change-Id: Iac24f8f1c5fa31a9230e4ab3915a96279c1b728d 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