Jean-Baptiste Queru 36e7790b6b Merge a851d8d0 from gingerbread ...

Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a

2010-10-15 17:02:57 -07:00

..

android

am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread

2010-10-15 08:51:01 -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: Move NFC service implementation out of system_server.

2010-10-15 02:12:32 -07:00