summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2023-02-17 06:32:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-17 06:32:19 +0000
commitdd76f4b3fc2fde1122b15c8dfa89f5cdb43dc6d7 (patch)
treee08a259fe0b8a9481709f1ab318520c7032b30bd /libs/androidfw/ApkParsing.cpp
parent1a078491d10dd7983ea77740fed40be9f3481f35 (diff)
parent3481e8423de1fdb57257ad8f1bae434b73661dbc (diff)
Merge "Add the IP version and encap type to IkeSessionParamsUtils." am: 325527e280 am: 0792817c6b am: 3481e8423d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2435234 Change-Id: I799ab7a7a4153e405488efe7f486c9bbcf98983b 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