From: Matthew Xie <mattx@google.com>
Date: Mon, 28 Jul 2014 22:00:24 +0000 (+0000)
Subject: am 68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge... 
X-Git-Tag: android-x86-7.1-r1~1261^2~194
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b5dd19dbd524754e0d53476b8df76cafa177095;p=android-x86%2Fsystem-bt.git

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
---

1b5dd19dbd524754e0d53476b8df76cafa177095