tree 48c502dc0f220e3a1e1c7eae632b330ac93178d9
parent 289b7569f4f2611fe6972f1a418edfd304eceac5
parent c1d02417bbd4df7b3b8273a1fdd4dc7aedfef441
author Mitchell Wills <mwills@google.com> 1438728007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438728007 +0000

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

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