tree 0708f29a4d65549846ff60fb913d26daac0a654d
parent 7a3d56e1214bb36dee7ef85678c893d01587216f
parent 507ea24b8f881f8af42393a0512c88cf7397edb9
author Amith Yamasani <yamasani@google.com> 1355613030 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355613030 -0800

am 507ea24b: am ffdc7aed: Merge "avoid crashing system serer process"

* commit '507ea24b8f881f8af42393a0512c88cf7397edb9':
  avoid crashing system serer process