| commit | 57cac1fdf7f045622521849964597b6eaff5726b | [log] [tgz] |
|---|---|---|
| author | Uriel Rodriguez <urodriguez@google.com> | Thu May 10 09:33:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 10 09:33:39 2012 -0700 |
| tree | b1a22ecc57ac814aa5d4ac5aa3fc0196c66edbb6 | |
| parent | fa189c8f1cbe06fe024efc8b3f9f7b92eae2a225 [diff] | |
| parent | 49eea136f81f1bda4577a55bea4f88ddd129996b [diff] |
am 49eea136: am 363b6052: Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev * commit '49eea136f81f1bda4577a55bea4f88ddd129996b': changed pokeWakelock() callback to take time in milliseconds