| commit | fe6db33a4b6454f441c6f0f5ff622d7527c5680c | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Jan 27 11:20:16 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 11:20:16 2014 -0800 |
| tree | b2b7920d97df54457aadc1de109d86f2268d0f1f | |
| parent | 8ba3192fc5f3fd72217f5946e8bd1831f0854749 [diff] | |
| parent | 4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d [diff] |
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