Dianne Hackborn 63f40387d9 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

2010-11-10 18:01:21 -08:00

..

android

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

2010-11-10 18:01:21 -08:00

google/android

am 92010ff5: am dbac180d: Fix a merge problem with html mms

2010-07-21 11:26:17 -07:00