tree e50ceb5b0049bf4cfa0413caa9dd88b68bb24f94
parent 41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5
parent 0c5ec0e0db3ac8d3d1ed6796ab2bcc9cc37cf5fa
author Chris Wren <cwren@android.com> 1417811350 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417811350 +0000

am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

* commit '0c5ec0e0db3ac8d3d1ed6796ab2bcc9cc37cf5fa':
  Avoid race condition in heads up snooze code path.