tree 3dd61ae0a73d9b22aa39cbed420c6f92d5c7f21f
parent 84551d61fd4942aa4afb677ea3ae6ce7674c866c
parent 6abed0706be80764c4cffe46fcb8e01ec8d9be95
author Adrian Roos <roosa@google.com> 1440018916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440018916 +0000

am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev

* commit '6abed0706be80764c4cffe46fcb8e01ec8d9be95':
  Fix wakelock leak for dozing