tree 79f4956895947d26ed96770900619ae60f3ddfd9
parent 61f08c9b37961e2363a8e84c7135417bfbc0d891
parent 937b0978be5cda5ab4e12bc277dad42cde0e27b6
author Bart Sears <bsears@google.com> 1441123699 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441123699 +0000

am 937b0978: am aaebdd7f: am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev

* commit '937b0978be5cda5ab4e12bc277dad42cde0e27b6':
  Don't throttle "while idle" alarms while not dozing