tree 6d6ad44bd424ce1ed9824066760e9ad92231265e
parent 9bdd98e71dfaa3f8a2e0eb674c85ab193af08b05
parent cbb8786faf90a37ccc0fde389a6262f0c99461b7
author Treehugger Robot <treehugger-gerrit@google.com> 1616131666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616131666 +0000

Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62 am: cbb8786faf

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

Change-Id: I5c04566c379e2cad164d55050ffdc9152432dfd3