commit | c6ccdb081bdcdef369e2b6fde8091f3a4e84948a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:26 2020 +0000 |
tree | ff91615fb1e3e667d17ae689c86748c1ee18280c | |
parent | a09fa3fe72dc044c24ea7553e15ddc23460e486e [diff] | |
parent | da7537f3313a39033f2783a53b723dffb260a4c4 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5454f8f63c am: da7537f331 -s ours am skip reason: Change-Id I157d9f2815c15f0abd5e6f5396816dfc22873980 with SHA-1 c82bf076e9 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/1431552 Change-Id: I3c09340b93e57143af54550ad9ec89f795e26b78