am 969773aa: am 83d2698f: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread

* commit '969773aa735807acefd1788610d31e82322196de':
  Fix issue #3177284: Account for wake lock power usage on Crespo