tree 0b69f61be1484fbcb85853bd0a334bce2513cfaa
parent 77bea65432208747b7a37d7464409b8700c96fb1
parent 0d334365c6123388a0df81438b82122be29d19ab
author John Spurlock <jspurlock@google.com> 1412698944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412698944 +0000

am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev

* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.