summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 22:38:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 22:38:01 +0000
commit68ac9e7a868ab985e9c31d264db7ba3560e2765a (patch)
tree4733d0d3d01646fe465106c8d09bceab5ef485ba /libs/androidfw/ApkParsing.cpp
parentfdb6a765b3e6b8cbe508ff267cec367289ed3cbf (diff)
parent602ed494e66c4407793273d27d35a169786acec0 (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: 9814c53dc8 -s ours am: 341bc7a7a9 -s ours am: 602ed494e6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988 Change-Id: Iebc7108a94ae2d90085c6befb4f3189dd90bea81 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