| commit | 691ba0b6c3698b9f1bab5af69688d47482599b06 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Apr 09 01:29:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 01:29:27 2021 +0000 |
| tree | 6e35ffe4f2f15ca76b319ea506e7a0786b2e8b28 | |
| parent | 7391a9ce21573656a9179fb34fa82f51ad573ed3 [diff] | |
| parent | 202721a5b711f22110db0e20d41a0b4402318228 [diff] |
[automerger skipped] Merge "Use String in CaptivePortalData underlying types" am: 55d93ddb7e am: dae21e8596 am: 202721a5b7 -s ours am skip reason: skip tag Change-Id Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97 with SHA-1 60372ff53d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644997 Change-Id: I5bf71b3f1f938d06eae5c3739af081d49ea3777b