tree b95036fe57c7314a43e69faf3709b048515a726c
parent b92d08a7385f241722b2299a988ab7a55053f6ea
parent 6195eb134be28a62b2bd70b07b94f16311ef6169
author David Turner <digit@google.com> 1295378334 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295378334 -0800

am 6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb

* commit '6195eb134be28a62b2bd70b07b94f16311ef6169':
  Prevent Dropbox from crashing system server pre-boot.