Skip to content
Commit 768da4ff authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am:... 

Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349 am: 029885f8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I413a7801db110980b3da7147b2ce29c867a1d2fc
parents bcbfb511 029885f8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment