[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 4e34417eec am: e9aecbb5d2 am: 19381a5938 -s ours

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

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

Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b
This commit is contained in:
Remi NGUYEN VAN
2021-04-09 01:29:27 +00:00
committed by Automerger Merge Worker

Diff Content Not Available