Skip to content
Commit 9dd7f6da authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use String in CaptivePortalData underlying types"... 

[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cd am: 061a4f93 am: 04ca7708 -s ours

am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 8d3d5456 is already in history

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

Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
parents 1c3654fb 04ca7708
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