tree 5b5068d179e81743f3d1257080c86a50c7ed70ba
parent 9d15a496d1354210da4ad83ee018b6dacf14b478
parent 992ae880743a49331ea0ab666f4fe3c8617750db
author Mitchell Wills <mwills@google.com> 1438726945 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438726945 +0000

am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit '992ae880743a49331ea0ab666f4fe3c8617750db':
  Charge apps for wifi tx time while scanning