tree e8e5284e4e35d97345b1ca01b1668507a415b2f9
parent bb0f157fa33b4c90e2f56f3e84ee4dba135dcea5
parent bc7c12a84ff177ffed849f096b9a920f89eb67ab
author Treehugger Robot <treehugger-gerrit@google.com> 1617797175 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617797175 +0000

[automerger skipped] Merge "Expose constants of ConnectivityManager" am: cb20318619 am: 9b01e26848 am: bc7c12a84f -s ours

am skip reason: skip tag Change-Id I715c766ad8e5eb54f4dc67239c1dbca7239506fc with SHA-1 cf6d450eb8 is already in history

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

Change-Id: I998cf20b3f54ccdfadf46e64ee655858e3534097