am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on...
am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '83d2698f':
Fix issue #3177284: Account for wake lock power usage on Crespo