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

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