Jean-Baptiste Queru 46089bd1cb am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp ...

Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.

2010-08-24 11:22:05 -07:00

..

android

am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp

2010-08-24 11:22:05 -07:00

google/android

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

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