tree db57e3a0a02f8f74759c1b823dc577c1eb9fce02
parent 5f981d97e72a5e254dae409de5a259fd2b2746e7
parent 026231284c44ca8cf789e0d5045c5ae6a91d7766
author Jean-Baptiste Queru <jbq@google.com> 1282674125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282674125 -0700

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

Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

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