| commit | b2b9b2dbdbc0445080d3c2d15212a43ba1f9cff1 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Jan 27 19:55:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 19:55:29 2014 +0000 |
| tree | c779ec77b2b38a183a2f5e012dbd03a7380af528 | |
| parent | 8e26486d2d811f94118381a163178078a3eee6c0 [diff] | |
| parent | 1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02 [diff] |
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