tree d1c996dc5e38f7793339a6b87ff1cd4990135d32
parent 7da9d7fae673473a3a24d3ff0127bd0c67f70337
parent 1dc1c93b9347380064c183398bb0441d99a33bf3
author Jorim Jaggi <jjaggi@google.com> 1439948627 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439948627 +0000

am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev

* commit '1dc1c93b9347380064c183398bb0441d99a33bf3':
  Fix race condition for doze mode and wake-and-unlocking