tree 8fd9bebb1a1120dd3a699436036cebb9856893c8
parent 64c529f226de50f6a99324fea995a90d4acebc0f
parent 6f0e41683ad69b938820cb3dca1b63e7064f3e6b
author David Su <dysu@google.com> 1575508767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1575508767 +0000

Merge changes from topics "android-os-connectivity-wifiactivityenergyinfo", "requestactivityinfo"

* changes:
  Move WifiActivityEnergyInfo to android.os.connectivity
  BatteryStats: Move WifiActivityEnergyInfo to android.os.connectivity
  Statsd: Move WifiActivityEnergyInfo to android.os.connectivity
  Formalize WifiManager#requestActivityInfo as @SystemApi
  BatteryStats: Formalize WifiManager#requestActivityInfo
  Statsd: Formalize WifiManager#requestActivityInfo