OSDN Git Service

am 1b5dd19d: (-s ours) am 68732140: Merge "PM: Stop Power Manager Timer if in sniff...
authorMatthew Xie <mattx@google.com>
Mon, 28 Jul 2014 23:34:03 +0000 (23:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Jul 2014 23:34:03 +0000 (23:34 +0000)
* commit '1b5dd19dbd524754e0d53476b8df76cafa177095':
  PM: Stop Power Manager Timer if in sniff mode - do not merge


Trivial merge