tree 1ef2387af1864c37f58b2d0d2a7199d20b0633f3
parent 1c3654fbd882e9223f8ae673e93731123d0605f3
parent 04ca7708eca38f790fa4d3e6ada0861ed2115467
author Remi NGUYEN VAN <reminv@google.com> 1617931767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617931767 +0000

[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 13d7d5cde6 am: 061a4f93c0 am: 04ca7708ec -s ours

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

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

Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b