tree 65c286c44e17c1914f58098cf296eea5aceb6e44
parent 51057a4d0bda2b50eac85db0ce3f80bfcc664b4f
parent 6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d
author Andreas Huber <andih@google.com> 1335895092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335895092 -0700

am 6635c44c: Merge "Fix assertion triggered when mediaserver dies at roughly the same" into jb-dev

* commit '6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d':
  Fix assertion triggered when mediaserver dies at roughly the same