diff options
| author | 2022-04-07 11:13:54 +0000 | |
|---|---|---|
| committer | 2022-04-07 11:13:54 +0000 | |
| commit | 2194a62f15a06fb416916bd2a24e9e305977c868 (patch) | |
| tree | c0f24a08e7a7f6af6c5dfc9e27978bbf74c44409 /libs/androidfw/StringPool.cpp | |
| parent | 70a2f0ce66027d684c326f7b89fb3de5111a3b63 (diff) | |
| parent | 3caa3cf399e27750bbc9bd21ccfad92474e58a2e (diff) | |
Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249
Change-Id: I7d3a2631cd70a342e7f224fcd99ec8eb1e2c77d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions