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

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