commit | 6028c3cdd4ecaf06c7d9a5e5adea54ee6d79e84b | [log] [tgz] |
---|---|---|
author | Irfan Sheriff <isheriff@google.com> | Wed Dec 07 12:10:58 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 07 12:10:58 2011 -0800 |
tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
parent | 3005c4f778a29028700941f07d728271d7a98b02 [diff] | |
parent | a62cec7696316909b172644222bad53bcdfbba43 [diff] |
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1 * commit '8c2122cb3e347c607126c49d76fb165125a02295': Fix CS wakelock handling