tree 96bcf8854c357992fecbb9829f431b07aa2fb933
parent fef42db92568918161a2a9d69411290adfa1720f
parent 1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac
author Jeff Hamilton <jham@android.com> 1275684765 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275684765 -0700

am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.

Merge commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken

* commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
  Don't crash when low storage is encountered pre-boot completion.