tree 2168d496d4bca8c51940dd45eb48cf3f52ea6a50
parent 41e94b11c8e797e85190b02e8c5dbd5263eec409
parent e8f300c360ca8ae2697fc22d0a312669def614fb
author Remi NGUYEN VAN <reminv@google.com> 1606910039 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606910039 +0000

Merge "Remove CaptivePortal deps on @hide MetricEvents" am: e8f300c360

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

Change-Id: I647b1cc3329c527d9afa507864700a521a0908be