Skip to content
Commit c7597bce authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add a separate namespace for CaptivePortalLogin... 

[automerger skipped] Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e am: 6c6b1f1c am: 8089e2a4 am: a0863518 am: 964b0208 -s ours

am skip reason: Merged-In I5657a886b4ecc4f0ff4126588ae1f6e0712269a0 with SHA-1 29f399a1 is already in history

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

Change-Id: Ibfd57118d3bbc32c07380f7f30f350308b9c37b3
parents 4b555a03 964b0208
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment