OSDN Git Service

am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into...
authorMitchell Wills <mwills@google.com>
Tue, 4 Aug 2015 22:12:30 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 22:12:30 +0000 (22:12 +0000)
* commit 'e8c888c41949c174f8cc244f8d705e675a2f3c30':
  Charge apps for wifi tx time while scanning


Trivial merge