OSDN Git Service

am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
authorEric Laurent <elaurent@google.com>
Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)
commitfe6db33a4b6454f441c6f0f5ff622d7527c5680c
treeb2b7920d97df54457aadc1de109d86f2268d0f1f
parent8ba3192fc5f3fd72217f5946e8bd1831f0854749
parent4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d
am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"

* commit '4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d':
  Only increase the counter when we do take a wakelock