tree f9bc2c31bc871350cdf02180d7ebfdf2d993ac85
parent 160222a4390d7738b541ed3f5c116d22c1fda04b
parent 42e606250a13edc22cb9f14937a4d73c14cc41aa
author Roshan Pius <rpius@google.com> 1459274615 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459274617 +0000

Merge changes from topic 'wifi_tx_power_levels' into nyc-dev

* changes:
  Add new wifi tx power levels in Wifi activity energy
  Add new wifi tx power levels in link layer stats