tree 7d6b8f233799b2125caf19ccb606d28ad0dc2220
parent cb3dafc4bf5ac8a9d8284afbf802b5f8513257c3
parent 054fbe7829d1bfad41e73e17ad54f25b2a939f3e
author Dianne Hackborn <hackbod@google.com> 1260413322 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260413322 -0800

am d3cfb1bd: Merge change Ia48b3f2a into eclair

Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-plus-aosp

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix #2313887: Device doesn't boot after rebooting device...