| commit | 1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Jan 27 19:49:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 19:49:29 2014 +0000 |
| tree | b2b7920d97df54457aadc1de109d86f2268d0f1f | |
| parent | 9f875b2717b683cc61e3fa4ba24b3693fab5b46a [diff] | |
| parent | fe6db33a4b6454f441c6f0f5ff622d7527c5680c [diff] |
am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock" * commit 'fe6db33a4b6454f441c6f0f5ff622d7527c5680c': Only increase the counter when we do take a wakelock