tree c779ec77b2b38a183a2f5e012dbd03a7380af528
parent 8e26486d2d811f94118381a163178078a3eee6c0
parent 1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02
author Eric Laurent <elaurent@google.com> 1390852529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390852529 +0000

am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"

* commit '1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02':
  Only increase the counter when we do take a wakelock