OSDN Git Service

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


Trivial merge