| commit | e8818946cb1d580646bfebffe5e2dae306d60199 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 11:22:05 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 11:22:05 2010 -0700 |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | a691eca9a309d998fd82b6763a2cc9a44c34df94 [diff] | |
| parent | dba0f1677e21ada1b9586e81205ad82ea493b930 [diff] |
am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766' * commit '026231284c44ca8cf789e0d5045c5ae6a91d7766': Crash when powering off.