| commit | 363b60527ce82b0f56434e70a8124e4d41e2b1e0 | [log] [tgz] |
|---|---|---|
| author | Uriel Rodriguez <urodriguez@google.com> | Wed May 09 16:12:18 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 09 16:12:18 2012 -0700 |
| tree | 0eb288a0274d82d89b071b796931bd97c260f958 | |
| parent | a76f823c7f31bffdea4d49daa6c6165520928708 [diff] | |
| parent | dff307697d7a7482efe4c10cb3b07b9249524a42 [diff] |
Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev