tree af2b6a6ebf410af827603e463c6bd802ba9aeb07
parent 82a517475a9c16fad4d35ade87b4910393c82641
parent 49affef9246a8a57812fbbc0b687aef42a269b0a
author Dianne Hackborn <hackbod@google.com> 1289440707 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1289440708 -0800

Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread