summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2022-03-19 06:11:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-19 06:11:00 +0000
commit4d46a146002b1c1cdf1a02b0e49893c732223d24 (patch)
tree9a52f2d85df27d2c22c4f232d2552ac1b8eaa479 /libs/androidfw/AttributeResolution.cpp
parent00b739940f4cb07bcc6a81c0ee2e1c7fb6662bbe (diff)
parent492871c0b12254dc05275b5868cbc8fb57ec207b (diff)
Merge "Store IkeTunnelConnectionParams in Ikev2VpnProfile" am: bc6f905d38 am: 492871c0b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2029924 Change-Id: I4b9d9e1f7792996c0ca026be5013e3d5089395e7
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions