Jean-Baptiste Queru c43189e769 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep" ...

Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep

2010-10-10 18:51:43 -07:00

..

android

am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"

2010-10-10 18:51:43 -07:00

google/android

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

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

trustedlogic/trustednfc/android

NFC integration

2010-09-28 22:36:27 -07:00