OSDN Git Service

am 68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge...
authorMatthew Xie <mattx@google.com>
Mon, 28 Jul 2014 22:00:24 +0000 (22:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Jul 2014 22:00:24 +0000 (22:00 +0000)
commit1b5dd19dbd524754e0d53476b8df76cafa177095
tree4b90cb6dab1a2ba2516ea824ce4cdee4c62ca522
parent07b560f1de507bcfbf6ee1ea22eba8449dfbe252
parent68732140f7a0b3b982eaee6065eabd201fa94286
am 68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev

* commit '68732140f7a0b3b982eaee6065eabd201fa94286':
  PM: Stop Power Manager Timer if in sniff mode - do not merge