commit | 0eae121e2c25e525dc4c5f39e3494b0bd0bf6037 | [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 | 3fefaf409878dd941571ae61771be37f5ee5f292 | |
parent | df60573aae4babb978fddf3f8add3397102e0b67 [diff] | |
parent | 19381a5938b16ae22c6851b5d0e25ebc6f822a3c [diff] |
[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