summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2023-02-17 04:36:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-17 04:36:53 +0000
commit0792817c6bd4dfb28e1163d0eb791e4c98b34c9a (patch)
tree38e93046476621311d01128d36ed3625e1a9619c /libs/androidfw/ApkParsing.cpp
parent48e87881265394431d905493f5fae6bb9d92b6f7 (diff)
parent325527e28029e397abf4a88495e3ce63ee362a2e (diff)
Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e280
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2435234 Change-Id: I89225fe35087dde963c1ea6818968d18e94c5018 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