| commit | 8c2122cb3e347c607126c49d76fb165125a02295 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Dec 07 12:08:41 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 12:08:41 2011 -0800 |
| tree | 22cc039c9ae85105a73f6d7f85621eef6673d585 | |
| parent | 654ac45c21b257613957c8c172a3fdff79903fcd [diff] | |
| parent | a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98 [diff] |
am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1 * commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98': Fix CS wakelock handling