Chiachang Wang 4319575deb Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I494bcbae0a8ba83d8950db060c8f0fb3447ed050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-07 11:37:31 +00:00

..

ims

Revert "Revert "Migrate unsafe parcel APIs in framework-minus-apex""

2022-01-19 11:13:18 +00:00

internal

Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15

2022-04-07 11:37:31 +00:00

server

Merge "Optimize EROFS detection code." into tm-dev

2022-04-07 04:17:17 +00:00