summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 21:15:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 21:15:18 +0000
commit68db107c58c24e342ad0cfb4b3510e484e827ccd (patch)
tree41bce9575ecadf7bcebf2ef785244db7fcca71db /libs/androidfw/ApkParsing.cpp
parentacec179401a290bd4d51981f20a646c4522099ae (diff)
parent3c027f0a612292ad0f5dcd765cfaf2a79044f280 (diff)
[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740bf8 -s ours am: d294e11427 -s ours am: 346ad5fada -s ours am: a274175a7b -s ours am: 93ef7c0d25 -s ours am: 3c027f0a61 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988 Change-Id: Ibdbaa85d13ff9a8cf43cd50bd1450ca673d46812 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