tree eeda29222889d2dc6013e76a57d4ed6ee1d274d0
parent 92d72ca01ba1c9e6cfed318a86287ffd0cc2c385
parent e558a0000389a2523b8d3d3a787db6b4579d2bdc
author Brad Fitzpatrick <bradfitz@android.com> 1301937455 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301937455 -0700

am e558a000: Merge "Avoid crash in system server when mounting container"

* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container