From: Matthew Xie <mattx@google.com>
Date: Mon, 28 Jul 2014 23:34:03 +0000 (+0000)
Subject: am 1b5dd19d: (-s ours) am 68732140: Merge "PM: Stop Power Manager Timer if in sniff... 
X-Git-Tag: android-x86-7.1-r1~1475
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=45735f8fb3df1aa105414a67d0752f1baf0b6801;p=android-x86%2Fsystem-bt.git

am 1b5dd19d: (-s ours) am 68732140: Merge "PM: Stop Power Manager Timer if in sniff mode - do not merge" into lmp-dev

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

45735f8fb3df1aa105414a67d0752f1baf0b6801