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

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