tree 938a6dd806ac939bd509c3bc130a58b1b0a4b196
parent 0f3d0612b649731a084a791a6cc6fa1b74fcd1a1
parent 184440cea399d2332b5dc138a9e8a47e9cde3398
author Justin Harrison <astyrrian@google.com> 1442989084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442989084 +0000

am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev

* commit '184440cea399d2332b5dc138a9e8a47e9cde3398':
  Extended the maximum pulsing duration when dozing